X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/b4e566689f469cc1cffe99e50e16a346d0f9832d..060ca767db058036f7ade27219de9ebaf1d4737b:/tun-bsd.c

diff --git a/tun-bsd.c b/tun-bsd.c
index c9b8f7f0..22f01e6f 100644
--- a/tun-bsd.c
+++ b/tun-bsd.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: tun-bsd.c,v 1.3 2004/04/08 01:36:17 mdw Exp $
+ * $Id$
  *
  * Tunnel interface for 4.4BSD-derived systems
  *
@@ -28,13 +28,34 @@
 
 /*----- Header files ------------------------------------------------------*/
 
+#define TUN_INTERNALS
+
 #include "tripe.h"
 
 /*----- Main code ---------------------------------------------------------*/
 
-#if TUN_TYPE != TUN_BSD
-#  error "Tunnel type mismatch: fix the Makefile"
-#endif
+#ifdef TUN_BSD
+
+struct tunnel {
+  const tunnel_ops *ops;		/* Pointer to operations */
+  sel_file f;				/* Selector for tunnel device */
+  struct peer *p;			/* Pointer to my peer */
+  unsigned n;				/* Number of my tunnel device */
+};  
+
+/* --- @t_ifname@ --- *
+ *
+ * Arguments:	@tunnel *t@ = pointer to tunnel block
+ *
+ * Returns:	A pointer to the tunnel's interface name.
+ */
+
+static const char *t_ifname(tunnel *t)
+{
+  static char buf[8];
+  sprintf(buf, "tun%u", t->n);
+  return (buf);
+}
 
 /* --- @t_read@ --- *
  *
@@ -47,7 +68,7 @@
  * Use:		Reads data from the tunnel.
  */
 
-void t_read(int fd, unsigned mode, void *v)
+static void t_read(int fd, unsigned mode, void *v)
 {
   tunnel *t = v;
   ssize_t n;
@@ -55,18 +76,18 @@ void t_read(int fd, unsigned mode, void *v)
 
   n = read(fd, buf_i, sizeof(buf_i));
   if (n < 0) {
-    a_warn("tunnel read failed (%s): %s", tun_ifname(t), strerror(errno));
+    a_warn("TUN %s read-error -- %s", t_ifname(t), strerror(errno));
     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-bsd: packet arrived");
+    trace_block(T_PACKET, "tun-bsd: packet contents", buf_i, n);
   })
   buf_init(&b, buf_i, n);
   p_tun(t->p, &b);
 }
 
-/* --- @tun_init@ --- *
+/* --- @t_init@ --- *
  *
  * Arguments:	---
  *
@@ -76,25 +97,22 @@ 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;
   unsigned n;
+  tunnel *t;
   char buf[16];
 
   n = 0;
@@ -107,40 +125,28 @@ int tun_create(tunnel *t, peer *p)
 	T( trace(T_TUNNEL, "tunnel device %u busy: skipping", n); )
 	break;
       case ENOENT:
-	a_warn("no suitable tunnel devices found");
-	return (-1);
+	a_warn("TUN - bsd no-tunnel-devices");
+	return (0);
       default:
-	a_warn("error opening `%s': %s (skipping)", buf, strerror(errno));
+	a_warn("TUN - open-error %s -- %s", buf, strerror(errno));
 	break;
     }
     n++;
   }
 
+  t = CREATE(tunnel);
+  t->ops = &tun_bsd;
   fdflags(fd, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
   t->p = p;
   t->n = n;
   sel_initfile(&sel, &t->f, fd, SEL_READ, t_read, t);
   sel_addfile(&t->f);
-  T( trace(T_TUNNEL, "tunnel: attached interface %s to peer `%s'",
-	   tun_ifname(t), p_name(p)); )
-  return (0);
-}
-
-/* --- @tun_ifname@ --- *
- *
- * Arguments:	@tunnel *t@ = pointer to tunnel block
- *
- * Returns:	A pointer to the tunnel's interface name.
- */
-
-const char *tun_ifname(tunnel *t)
-{
-  static char buf[8];
-  sprintf(buf, "tun%u", t->n);
-  return (buf);
+  T( trace(T_TUNNEL, "tun-bsd: attached interface %s to peer `%s'",
+	   t_ifname(t), p_name(p)); )
+  return (t);
 }
 
-/* --- @tun_inject@ --- *
+/* --- @t_inject@ --- *
  *
  * Arguments:	@tunnel *t@ = pointer to tunnel block
  *		@buf *b@ = buffer to send
@@ -150,16 +156,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_block(T_PACKET, "tunnel: packet contents", BBASE(b), BLEN(b));
+    trace(T_TUNNEL, "tun-bsd: inject decrypted packet");
+    trace_block(T_PACKET, "tun-bsd: 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
  *
@@ -168,10 +174,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_bsd = {
+  "bsd",
+  t_init,
+  t_create,
+  t_ifname,
+  t_inject,
+  t_destroy
+};
+
+#endif
+
 /*----- That's all, folks -------------------------------------------------*/