Manpages: Fix substitutions.

[tripe] / server / tun-bsd.c

diff --git a/server/tun-bsd.c b/server/tun-bsd.c
index 12765e5d4673b6ce17f407195ba40a24cbead681..bfa528b2d5c4e63030aaa364ba2aa2961de7ba14 100644 (file)
--- a/server/tun-bsd.c
+++ b/server/tun-bsd.c
@@ -38,7 +38,6 @@ 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_read@ --- *
@@ -86,6 +85,7 @@ static void t_init(void) { return; }
 /* --- @t_create@ --- *
  *
  * Arguments:  @peer *p@ = pointer to peer block
+ *             @int fd@ = file descriptor of tunnel device
  *             @char **ifn@ = where to put the interface name
  *
  * Returns:    A tunnel block if it worked, or null on failure.
@@ -93,42 +93,16 @@ static void t_init(void) { return; }
  * Use:                Initializes a new tunnel.
  */
 
-static tunnel *t_create(peer *p, char **ifn)
+static tunnel *t_create(peer *p, int fd, char **ifn)
 {
-  int fd;
-  unsigned n;
   tunnel *t;
-  char buf[16];
-
-  n = 0;
-  for (;;) {
-    sprintf(buf, "/dev/tun%u", n);
-    if ((fd = open(buf, O_RDWR)) >= 0)
-      break;
-    switch (errno) {
-      case EBUSY:
-       T( trace(T_TUNNEL, "tunnel device %u busy: skipping", n); )
-       break;
-      case ENOENT:
-       a_warn("TUN", "-", "bsd", "no-tunnel-devices", A_END);
-       return (0);
-      default:
-       a_warn("TUN", "-", "open-error", "%s", buf, "?ERRNO", A_END);
-       break;
-    }
-    n++;
-  }
 
+  fdflags(fd, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
   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);
-  *ifn = xstrdup(buf + 5);
-  T( trace(T_TUNNEL, "tun-bsd: attached interface %s to peer `%s'",
-          *ifn, p_name(p)); )
   return (t);
 }
 
@@ -161,14 +135,11 @@ static void t_inject(tunnel *t, buf *b)
  */
 
 static void t_destroy(tunnel *t)
-{
-  sel_rmfile(&t->f);
-  close(t->f.fd);
-  DESTROY(t);
-}
+  { sel_rmfile(&t->f); close(t->f.fd); DESTROY(t); }
 
 const tunnel_ops tun_bsd = {
   "bsd",
+  TUNF_PRIVOPEN,
   t_init,
   t_create,
   0,