server/tests.at: Fix TRIPECTL_INTERACT argument order.

[tripe] / server / tun-linux.c

diff --git a/server/tun-linux.c b/server/tun-linux.c
index cffeb56d0e7456ffc6ae2b53b2da91418e1db86d..33451746fd9ff9adbff726f5d06ca0d299c9764e 100644 (file)
--- a/server/tun-linux.c
+++ b/server/tun-linux.c
@@ -65,7 +65,8 @@ 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", p_ifname(t->p), "read-error", "?ERRNO", A_END);
+    a_warn("TUN", "%s", p_ifname(t->p), "linux",
+          "read-error", "?ERRNO", A_END);
     return;
   }
   IF_TRACING(T_TUNNEL, {
@@ -91,6 +92,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.
@@ -98,37 +100,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;
-  int f;
-  struct ifreq iff;
   tunnel *t;
 
-  if ((fd = open("/dev/net/tun", O_RDWR)) < 0) {
-    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_NO_PI;
-  if ((f = ioctl(fd, TUNSETIFF, &iff)) < 0) {
-    a_warn("TUN", "-", "linux", "config-error", "?ERRNO", A_END);
-    close(fd);
-    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;
-  *ifn = xstrdup(iff.ifr_name);
-  T( trace(T_TUNNEL, "tun-linux: attached interface %s to peer `%s'",
-          *ifn, p_name(p)); )
   return (t);
 }
 
@@ -144,11 +125,13 @@ static tunnel *t_create(peer *p, char **ifn)
 
 static void t_inject(tunnel *t, buf *b)
 {
+  int hunoz;
+
   IF_TRACING(T_TUNNEL, {
     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));
+  hunoz = write(t->f.fd, BBASE(b), BLEN(b));
 }
 
 /* --- @t_destroy@ --- *
@@ -165,6 +148,7 @@ static void t_destroy(tunnel *t)
 
 const tunnel_ops tun_linux = {
   "linux",
+  TUNF_PRIVOPEN,
   t_init,
   t_create,
   0,