X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=tun.c;h=9ef3a9d627c161b96c50290b2985dcf7d307d176;hp=0baaf12226101cf83af5099cfac99e2fc6e464ae;hb=c6a3b1f54ccc754be82f0a2ea5b4d60746053a2b;hpb=076bb54e68477f883033bee696c9c5f801ece2f2

diff --git a/tun.c b/tun.c
index 0baaf12..9ef3a9d 100644
--- a/tun.c
+++ b/tun.c
@@ -81,7 +81,6 @@ 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 cstring_t tun_flavour_str(uint32_t flavour)
@@ -116,8 +115,8 @@ static void tun_afterpoll(void *sst, struct pollfd *fds, int nfds)
     }
     if (fds[0].revents&POLLIN) {
 	BUF_ALLOC(st->buff,"tun_afterpoll");
-	buffer_init(st->buff,st->nl.max_start_pad);
-	l=read(st->fd,st->buff->start,st->buff->len-st->nl.max_start_pad);
+	buffer_init(st->buff,calculate_max_start_pad());
+	l=read(st->fd, st->buff->start, buf_remaining_space(st->buff));
 	if (l<0) {
 	    fatal_perror("tun_afterpoll: read()");
 	}
@@ -166,8 +165,14 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes)
     struct subnet_list *nets;
     int32_t i;
     int fd=-1;
+    bool_t up;
 
-    if (routes->up == routes->kup) return False;
+    if (routes->options & OPT_SOFTROUTE)
+        up = routes->up;
+    else
+        up = routes->link_quality > LINK_QUALITY_UNUSED;
+
+    if (up == routes->kup) return False;
     if (st->route_type==TUN_CONFIG_IOCTL) {
 	if (st->tun_flavour==TUN_FLAVOUR_STREAMS) {
 	    fd=open(st->ip_path,O_RDWR);
@@ -187,20 +192,20 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes)
 	network=ipaddr_to_string(nets->list[i].prefix);
 	mask=ipaddr_to_string(nets->list[i].mask);
 	Message(M_INFO,"%s: %s route %s/%d %s kernel routing table\n",
-		st->nl.name,routes->up?"adding":"deleting",network,
-		nets->list[i].len,routes->up?"to":"from");
+		st->nl.name,up?"adding":"deleting",network,
+		nets->list[i].len,up?"to":"from");
 	switch (st->route_type) {
 	case TUN_CONFIG_LINUX:
-	    sys_cmd(st->route_path,"route",routes->up?"add":"del",
+	    sys_cmd(st->route_path,"route",up?"add":"del",
 		    "-net",network,"netmask",mask,
 		    "gw",secnetaddr,(char *)0);
 	    break;
 	case TUN_CONFIG_BSD:
-	    sys_cmd(st->route_path,"route",routes->up?"add":"del",
+	    sys_cmd(st->route_path,"route",up?"add":"del",
 		    "-net",network,secnetaddr,mask,(char *)0);
 	    break;
 	case TUN_CONFIG_SOLARIS25:
-	    sys_cmd(st->route_path,"route",routes->up?"add":"del",
+	    sys_cmd(st->route_path,"route",up?"add":"del",
 		    network,secnetaddr,(char *)0);
 	    break;
 	case TUN_CONFIG_IOCTL:
@@ -222,7 +227,7 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes)
 	    sa->sin_family=AF_INET;
 	    sa->sin_addr.s_addr=htonl(st->nl.secnet_address);
 	    rt.rt_flags=RTF_UP|RTF_GATEWAY;
-	    action=routes->up?SIOCADDRT:SIOCDELRT;
+	    action=up?SIOCADDRT:SIOCDELRT;
 	    if (ioctl(fd,action,&rt)<0) {
 		fatal_perror("tun_set_route: ioctl()");
 	    }
@@ -235,13 +240,11 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes)
 	    fatal("tun_set_route: unsupported route command type");
 	    break;
 	}
-	free(network); free(mask);
     }
-    free(secnetaddr);
-    if (st->route_type==TUN_CONFIG_IOCTL) {
+    if (fd >= 0) {
 	close(fd);
     }
-    routes->kup=routes->up;
+    routes->kup=up;
     return True;
 }
 
@@ -337,6 +340,8 @@ static void tun_phase_hook(void *sst, uint32_t newphase)
 	st->interface_name=safe_malloc(10,"tun_apply");
 	sprintf(st->interface_name,"tun%d",ppa);
 	st->fd=tun_fd;
+	setcloexec(if_ifd);
+	setcloexec(ip_ifd);
 #else
 	fatal("tun_phase_hook: TUN_FLAVOUR_STREAMS unexpected");
 #endif /* HAVE_TUN_STREAMS */
@@ -347,7 +352,9 @@ 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->local_address);
+    setcloexec(st->fd);
+
+    hostaddr=ipaddr_to_string(st->nl.local_address);
     secnetaddr=ipaddr_to_string(st->nl.secnet_address);
     snprintf(mtu,sizeof(mtu),"%d",st->nl.mtu);
     mtu[5]=0;
@@ -381,7 +388,7 @@ static void tun_phase_hook(void *sst, uint32_t newphase)
 	sa=(struct sockaddr_in *)&ifr.ifr_addr;
 	FILLZERO(*sa);
 	sa->sin_family=AF_INET;
-	sa->sin_addr.s_addr=htonl(st->local_address);
+	sa->sin_addr.s_addr=htonl(st->nl.local_address);
 	if (ioctl(fd,SIOCSIFADDR, &ifr)!=0) {
 	    fatal_perror("tun_apply: SIOCSIFADDR");
 	}
@@ -485,8 +492,6 @@ static list_t *tun_create(closure_t *self, struct cloc loc, dict_t *context,
     st->route_path=dict_read_string(dict,"route-path",False,"tun-netlink",loc);
 
     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");
 
     if (st->tun_flavour==TUN_FLAVOUR_GUESS) {
 	/* If we haven't been told what type of TUN we're using, take