server/tun-*.c: Factor out the (very similar) TUN-like drivers.

[tripe] / server / tun-std.c

diff --git a/server/tun-linux.c b/server/tun-std.c
similarity index 77%
rename from server/tun-linux.c
rename to server/tun-std.c
index 7b1fa1d..2983767 100644 (file)
--- a/server/tun-linux.c
+++ b/server/tun-std.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * Tunnel interface based on Linux TUN/TAP driver
+ * Tunnel interface for Linux-tun-shaped arrangements
  *
  * (c) 2003 Straylight/Edgeware
  */
@@ -30,15 +30,9 @@
 
 #include "tripe.h"
 
-#ifdef TUN_LINUX
-#  include <sys/ioctl.h>
-#  include <linux/if.h>
-#  include <linux/if_tun.h>
-#endif
-
 /*----- Main code ---------------------------------------------------------*/
 
-#ifdef TUN_LINUX
+#if defined(TUN_LINUX) || defined(TUN_BSD) || defined(TUN_UNET)
 
 struct tunnel {
   const tunnel_ops *ops;               /* Pointer to operations */
@@ -65,13 +59,13 @@ static void t_read(int fd, unsigned mode, void *v)
 
   n = read(fd, buf_i, sizeof(buf_i));
   if (n < 0) {
-    a_warn("TUN", "%s", p_ifname(t->p), "linux",
+    a_warn("TUN", "%s", p_ifname(t->p), "%s", t->ops->name,
           "read-error", "?ERRNO", A_END);
     return;
   }
   IF_TRACING(T_TUNNEL, {
-    trace(T_TUNNEL, "tun-linux: packet arrived");
-    trace_block(T_PACKET, "tun-linux: packet contents", buf_i, n);
+    trace(T_TUNNEL, "tun-%s: packet arrived", t->ops->name);
+    trace_block(T_PACKET, "tunnel: packet contents", buf_i, n);
   })
   buf_init(&b, buf_i, n);
   p_tun(t->p, &b);
@@ -100,13 +94,13 @@ static void t_init(void) { return; }
  * Use:                Initializes a new tunnel.
  */
 
-static tunnel *t_create(peer *p, int fd, char **ifn)
+static tunnel *t_create(peer *p, int fd, char **ifn, const tunnel_ops *ops)
 {
   tunnel *t;
 
   fdflags(fd, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
   t = CREATE(tunnel);
-  t->ops = &tun_linux;
+  t->ops = ops;
   t->p = p;
   sel_initfile(&sel, &t->f, fd, SEL_READ, t_read, t);
   sel_addfile(&t->f);
@@ -126,7 +120,7 @@ static tunnel *t_create(peer *p, int fd, char **ifn)
 static void t_inject(tunnel *t, buf *b)
 {
   IF_TRACING(T_TUNNEL, {
-    trace(T_TUNNEL, "tun-linux: inject decrypted packet");
+    trace(T_TUNNEL, "tun-%s: inject decrypted packet", t->ops->name);
     trace_block(T_PACKET, "tunnel: packet contents", BBASE(b), BLEN(b));
   })
   DISCARD(write(t->f.fd, BBASE(b), BLEN(b)));
@@ -144,15 +138,29 @@ static void t_inject(tunnel *t, buf *b)
 static void t_destroy(tunnel *t)
   { sel_rmfile(&t->f); close(t->f.fd); DESTROY(t); }
 
-const tunnel_ops tun_linux = {
-  "linux",
-  TUNF_PRIVOPEN,
-  t_init,
-  t_create,
-  0,
-  t_inject,
-  t_destroy
-};
+#define DEFOPS(name)                                                   \
+                                                                       \
+static tunnel *t_create_##name(peer *p, int fd, char **ifn);           \
+                                                                       \
+const tunnel_ops tun_##name = {                                                \
+  #name, TUNF_PRIVOPEN,                                                        \
+  t_init, t_create_##name, 0, t_inject, t_destroy                      \
+};                                                                     \
+                                                                       \
+static tunnel *t_create_##name(peer *p, int fd, char **ifn)            \
+  { return t_create(p, fd, ifn, &tun_##name); }
+
+#ifdef TUN_LINUX
+  DEFOPS(linux)
+#endif
+
+#ifdef TUN_BSD
+  DEFOPS(bsd)
+#endif
+
+#ifdef TUN_UNET
+  DEFOPS(unet)
+#endif
 
 #endif