X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/3cdc3f3a27e8c4f4fe692009d868c773d298a68c..042d5c20a1c42002b35aa13c7a44dfb4a94d2e65:/tun-linux.c?ds=sidebyside

diff --git a/tun-linux.c b/tun-linux.c
index 6aa5adb4..3cfa5d72 100644
--- a/tun-linux.c
+++ b/tun-linux.c
@@ -28,15 +28,26 @@
 
 /*----- Header files ------------------------------------------------------*/
 
+#define TUN_INTERNALS
+
 #include "tripe.h"
 
-#include <sys/ioctl.h>
+#ifdef TUN_LINUX
+#  include <sys/ioctl.h>
+#  include <linux/if.h>
+#  include <linux/if_tun.h>
+#endif
 
 /*----- Main code ---------------------------------------------------------*/
 
-#if TUN_TYPE != TUN_LINUX
-#  error "Tunnel type mismatch: fix the Makefile"
-#endif
+#ifdef TUN_LINUX
+
+struct tunnel {
+  const tunnel_ops *ops;		/* Pointer to operations */
+  sel_file f;				/* Selector for TUN/TAP device */
+  struct peer *p;			/* Pointer to my peer */
+  char ifn[IFNAMSIZ];			/* Interface name buffer */
+};  
 
 /* --- @t_read@ --- *
  *
@@ -57,18 +68,18 @@ 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 read-error -- %s", t->ifn, strerror(errno));
+    a_warn("TUN", "%s", t->ifn, "read-error", "?ERRNO", A_END);
     return;
   }
   IF_TRACING(T_TUNNEL, {
-    trace(T_TUNNEL, "tunnel: packet arrived");
-    trace_block(T_PACKET, "tunnel: packet contents", buf_i, n);
+    trace(T_TUNNEL, "tun-linux: packet arrived");
+    trace_block(T_PACKET, "tun-linux: packet contents", buf_i, n);
   })
   buf_init(&b, buf_i, n);
   p_tun(t->p, &b);
 }
 
-/* --- @tun_init@ --- *
+/* --- @t_init@ --- *
  *
  * Arguments:	---
  *
@@ -78,62 +89,61 @@ static void t_read(int fd, unsigned mode, void *v)
  *		opening file descriptors or something.
  */
 
-void tun_init(void)
-{
-  return;
-}
+static void t_init(void) { return; }
 
-/* --- @tun_create@ --- *
+/* --- @t_create@ --- *
  *
- * Arguments:	@tunnel *t@ = pointer to tunnel block
- *		@peer *p@ = pointer to peer block
+ * Arguments:	@peer *p@ = pointer to peer block
  *
- * Returns:	Zero if it worked, nonzero on failure.
+ * Returns:	A tunnel block if it worked, or null on failure.
  *
  * Use:		Initializes a new tunnel.
  */
 
-int tun_create(tunnel *t, peer *p)
+static tunnel *t_create(peer *p)
 {
   int fd;
   int f;
   struct ifreq iff;
+  tunnel *t;
 
   if ((fd = open("/dev/net/tun", O_RDWR)) < 0) {
-    a_warn("TUN - open-error /dev/net/tun -- %s", strerror(errno));
-    return (-1);
+    a_warn("TUN", "-", "linux",
+	    "open-error", "/dev/net/tun", "?ERRNO",
+	    A_END);
+    return (0);
   }
   fdflags(fd, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
+  memset(&iff, 0, sizeof(iff));
   iff.ifr_name[0] = 0;
-  iff.ifr_flags = IFF_TUN;
+  iff.ifr_flags = IFF_TUN | IFF_NO_PI;
   if ((f = ioctl(fd, TUNSETIFF, &iff)) < 0) {
-    a_warn("TUN - linux config-error -- %s", strerror(errno));
+    a_warn("TUN", "-", "linux", "config-error", "?ERRNO", A_END);
     close(fd);
-    return (-1);
+    return (0);
   }
+  t = CREATE(tunnel);
+  t->ops = &tun_linux;
   t->p = p;
   sel_initfile(&sel, &t->f, fd, SEL_READ, t_read, t);
   sel_addfile(&t->f);
   iff.ifr_name[IFNAMSIZ - 1] = 0;
   strcpy(t->ifn, iff.ifr_name);
-  T( trace(T_TUNNEL, "tunnel: attached interface %s to peer `%s'",
+  T( trace(T_TUNNEL, "tun-linux: attached interface %s to peer `%s'",
 	   t->ifn, p_name(p)); )
-  return (0);
+  return (t);
 }
 
-/* --- @tun_ifname@ --- *
+/* --- @t_ifname@ --- *
  *
  * Arguments:	@tunnel *t@ = pointer to tunnel block
  *
  * Returns:	A pointer to the tunnel's interface name.
  */
 
-const char *tun_ifname(tunnel *t)
-{
-  return (t->ifn);
-}
+static const char *t_ifname(tunnel *t) { return (t->ifn); }
 
-/* --- @tun_inject@ --- *
+/* --- @t_inject@ --- *
  *
  * Arguments:	@tunnel *t@ = pointer to tunnel block
  *		@buf *b@ = buffer to send
@@ -143,16 +153,16 @@ const char *tun_ifname(tunnel *t)
  * Use:		Injects a packet into the local network stack.
  */
 
-void tun_inject(tunnel *t, buf *b)
+static void t_inject(tunnel *t, buf *b)
 {
   IF_TRACING(T_TUNNEL, {
-    trace(T_TUNNEL, "tunnel: inject decrypted packet");
+    trace(T_TUNNEL, "tun-linux: inject decrypted packet");
     trace_block(T_PACKET, "tunnel: packet contents", BBASE(b), BLEN(b));
   })
   write(t->f.fd, BBASE(b), BLEN(b));
 }
 
-/* --- @tun_destroy@ --- *
+/* --- @t_destroy@ --- *
  *
  * Arguments:	@tunnel *t@ = pointer to tunnel block
  *
@@ -161,10 +171,22 @@ void tun_inject(tunnel *t, buf *b)
  * Use:		Destroys a tunnel.
  */
 
-void tun_destroy(tunnel *t)
+static void t_destroy(tunnel *t)
 {
   sel_rmfile(&t->f);
   close(t->f.fd);
+  DESTROY(t);
 }
 
+const tunnel_ops tun_linux = {
+  "linux",
+  t_init,
+  t_create,
+  t_ifname,
+  t_inject,
+  t_destroy
+};
+
+#endif
+
 /*----- That's all, folks -------------------------------------------------*/