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

diff --git a/tun.c b/tun.c
index 0baaf12..40bf6dd 100644
--- a/tun.c
+++ b/tun.c
@@ -116,8 +116,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,st->buff->len-calculate_max_start_pad());
 	if (l<0) {
 	    fatal_perror("tun_afterpoll: read()");
 	}
@@ -166,8 +166,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 +193,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 +228,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()");
 	    }
@@ -241,7 +247,7 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes)
     if (st->route_type==TUN_CONFIG_IOCTL) {
 	close(fd);
     }
-    routes->kup=routes->up;
+    routes->kup=up;
     return True;
 }