X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/9d3a4132788b198345116624761c12ed7bc936b6..794f2398b8fe84bf398bb10d6eeca6fe6737f65f:/tun.c

diff --git a/tun.c b/tun.c
index a36f444..20ae29b 100644
--- a/tun.c
+++ b/tun.c
@@ -12,7 +12,7 @@
 #include <linux/if_tun.h>
 #endif
 
-/* XXX where do we find if_tun on other platforms? */
+/* Where do we find if_tun on other platforms? */
 
 /* Connection to the kernel through the universal TUN/TAP driver */
 
@@ -28,6 +28,7 @@ struct tun {
     struct buffer_if *buff; /* We receive packets into here
 			       and send them to the netlink code. */
     netlink_deliver_fn *netlink_to_tunnel;
+    uint32_t local_address; /* host interface address */
 };
 
 static int tun_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
@@ -47,6 +48,7 @@ static void tun_afterpoll(void *sst, struct pollfd *fds, int nfds,
     struct tun *st=sst;
     int l;
 
+    if (nfds==0) return;
     if (fds[0].revents&POLLERR) {
 	printf("tun_afterpoll: hup!\n");
     }
@@ -62,20 +64,19 @@ static void tun_afterpoll(void *sst, struct pollfd *fds, int nfds,
 	}
 	if (l>0) {
 	    st->buff->size=l;
-	    st->netlink_to_tunnel(&st->nl,NULL,st->buff);
+	    st->netlink_to_tunnel(&st->nl,st->buff);
 	    BUF_ASSERT_FREE(st->buff);
 	}
     }
 }
 
-static void tun_deliver_to_kernel(void *sst, void *cid,
-				  struct buffer_if *buf)
+static void tun_deliver_to_kernel(void *sst, struct buffer_if *buf)
 {
     struct tun *st=sst;
 
     BUF_ASSERT_USED(buf);
-
-    /* No error checking, because we'd just throw the packet away anyway */
+    /* No error checking, because we'd just throw the packet away
+       anyway if it didn't work. */
     write(st->fd,buf->start,buf->size);
     BUF_FREE(buf);
 }
@@ -156,7 +157,7 @@ static void tun_phase_hook(void *sst, uint32_t newphase)
 						no extra headers */
 	if (st->interface_name)
 	    strncpy(ifr.ifr_name,st->interface_name,IFNAMSIZ);
-	Message(M_INFO,"%s: about to ioctl(TUNSETIFF)...\n",st->nl.name);
+	Message(M_DEBUG,"%s: about to ioctl(TUNSETIFF)...\n",st->nl.name);
 	if (ioctl(st->fd,TUNSETIFF,&ifr)<0) {
 	    fatal_perror("%s: ioctl(TUNSETIFF)",st->nl.name);
 	}
@@ -174,7 +175,7 @@ static void tun_phase_hook(void *sst, uint32_t newphase)
        to set the TUN device's address, and route to add routes to all
        our networks. */
 
-    hostaddr=ipaddr_to_string(st->nl.local_address);
+    hostaddr=ipaddr_to_string(st->local_address);
     secnetaddr=ipaddr_to_string(st->nl.secnet_address);
     snprintf(mtu,6,"%d",st->nl.mtu);
     mtu[5]=0;
@@ -232,6 +233,8 @@ static list_t *tun_apply(closure_t *self, struct cloc loc, dict_t *context,
     if (!st->ifconfig_path) st->ifconfig_path="ifconfig";
     if (!st->route_path) st->route_path="route";
     st->buff=find_cl_if(dict,"buffer",CL_BUFFER,True,"tun-netlink",loc);
+    st->local_address=string_item_to_ipaddr(
+	dict_find_item(dict,"local-address", True, "netlink", loc),"netlink");
 
     add_hook(PHASE_GETRESOURCES,tun_phase_hook,st);
 
@@ -248,9 +251,6 @@ static list_t *tun_old_apply(closure_t *self, struct cloc loc, dict_t *context,
 
     st=safe_malloc(sizeof(*st),"tun_old_apply");
 
-    Message(M_WARNING,"the tun-old code has never been tested. Please report "
-	    "success or failure to steve@greenend.org.uk\n");
-
     /* First parameter must be a dict */
     item=list_elem(args,0);
     if (!item || item->type!=t_dict)
@@ -260,7 +260,7 @@ static list_t *tun_old_apply(closure_t *self, struct cloc loc, dict_t *context,
 
     st->netlink_to_tunnel=
 	netlink_init(&st->nl,st,loc,dict,
-		     "netlink-tun",NULL,tun_deliver_to_kernel);
+		     "netlink-tun",tun_set_route,tun_deliver_to_kernel);
 
     st->tun_old=True;
     st->device_path=dict_read_string(dict,"device",False,"tun-netlink",loc);
@@ -276,6 +276,8 @@ static list_t *tun_old_apply(closure_t *self, struct cloc loc, dict_t *context,
     if (!st->ifconfig_path) st->ifconfig_path="ifconfig";
     if (!st->route_path) st->route_path="route";
     st->buff=find_cl_if(dict,"buffer",CL_BUFFER,True,"tun-netlink",loc);
+    st->local_address=string_item_to_ipaddr(
+	dict_find_item(dict,"local-address", True, "netlink", loc),"netlink");
 
     /* Old TUN interface: the network interface name depends on which
        /dev/tunX file we open. If 'interface-search' is set to true, treat