server: Correct handling of interface names in tun interface.

[tripe] / server / tun-unet.c

diff --git a/server/tun-unet.c b/server/tun-unet.c
index c2b6e7710cef1a97a96b5ecf7993eb2cb77d0fc7..bdf23fe4454066dc0e08e96c41016f881521018f 100644 (file)
--- a/server/tun-unet.c
+++ b/server/tun-unet.c
@@ -48,29 +48,6 @@ struct tunnel {
   struct peer *p;                      /* Pointer to my peer */
 };
 
-/* --- @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 b[UNET_NAMEMAX];
-  struct unet_info uni;
-  if (ioctl(t->f.fd, UNIOCGINFO, &uni)) {
-    a_warn("TUN", "-", "unet", "getinfo-error", "?ERRNO", A_END);
-    return ("<error>");
-  }
-  if (strlen(uni.uni_ifname) + 1 > sizeof(b)) {
-    a_warn("TUN", "-", "unet", "ifname-too-long", A_END);
-    return ("<error>");
-  }
-  strcpy(b, uni.uni_ifname);
-  return (b);
-}
-
 /* --- @t_read@ --- *
  *
  * Arguments:  @int fd@ = file descriptor to read
@@ -90,7 +67,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, {
@@ -117,17 +94,19 @@ static void t_init(void) { return; }
  *
  * Arguments:  @tunnel *t@ = pointer to tunnel block
  *             @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;
   tunnel *t;
   int f;
+  struct unet_info uni;
 
   if ((fd = open("/dev/unet", O_RDWR)) < 0) {
     a_warn("TUN", "-", "unet", "open-error", "/dev/unet", "?ERRNO", A_END);
@@ -145,8 +124,14 @@ static tunnel *t_create(peer *p)
   t->p = p;
   sel_initfile(&sel, &t->f, fd, SEL_READ, t_read, t);
   sel_addfile(&t->f);
+
+  if (ioctl(t->f.fd, UNIOCGINFO, &uni)) {
+    a_warn("TUN", "-", "unet", "getinfo-error", "?ERRNO", A_END);
+    return ("<error>");
+  }
+  *ifn = xstrdup(uni.uni_ifname);
   T( trace(T_TUNNEL, "tun-unet: attached interface %s to peer `%s'",
-          t_ifname(t), p_name(p)); )
+          *ifn, p_name(p)); )
   return (t);
 }
 
@@ -189,7 +174,7 @@ const tunnel_ops tun_unet = {
   "unet",
   t_init,
   t_create,
-  t_ifname,
+  0,
   t_inject,
   t_destroy
 };