server: Correct handling of interface names in tun interface.

[tripe] / server / tun-bsd.c

diff --git a/server/tun-bsd.c b/server/tun-bsd.c
index 4e8c0bd82a6ba0d0a30fc5d3296f72aae7382e3c..cf6c6d02518a84a2b2985ba5101005c5df93fcd5 100644 (file)
--- a/server/tun-bsd.c
+++ b/server/tun-bsd.c
@@ -43,20 +43,6 @@ struct tunnel {
   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@ --- *
  *
  * Arguments:  @int fd@ = file descriptor to read
@@ -76,7 +62,7 @@ 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", t_ifname(t), "read-error", "?ERRNO", A_END);
+    a_warn("TUN", "%s", p_ifname(t->p), "read-error", "?ERRNO", A_END);
     return;
   }
   IF_TRACING(T_TUNNEL, {
@@ -102,13 +88,14 @@ static void t_init(void) { return; }
 /* --- @t_create@ --- *
  *
  * Arguments:  @peer *p@ = pointer to peer block
+ *             @char **ifn@ = where to put the interface name
  *
  * Returns:    A tunnel block if it worked, or null on failure.
  *
  * Use:                Initializes a new tunnel.
  */
 
-static tunnel *t_create(peer *p)
+static tunnel *t_create(peer *p, char **ifn)
 {
   int fd;
   unsigned n;
@@ -141,8 +128,9 @@ static tunnel *t_create(peer *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'",
-          t_ifname(t), p_name(p)); )
+          *ifn, p_name(p)); )
   return (t);
 }
 
@@ -185,7 +173,7 @@ const tunnel_ops tun_bsd = {
   "bsd",
   t_init,
   t_create,
-  t_ifname,
+  0,
   t_inject,
   t_destroy
 };