X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=tun.c;h=d5e0e9e985e31eb615e0bcf5655d7c37f2116aab;hp=dcfd62392d825994665a787a88f3afe588230d3c;hb=656df7e2c9b688150ebe991d79a64ac096bb5f8e;hpb=091433c62a7e2fdb12f60d2468c5f98b9603f429

diff --git a/tun.c b/tun.c
index dcfd623..d5e0e9e 100644
--- a/tun.c
+++ b/tun.c
@@ -98,7 +98,7 @@ static int tun_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
 			  int *timeout_io)
 {
     struct tun *st=sst;
-    *nfds_io=1;
+    BEFOREPOLL_WANT_FDS(1);
     fds[0].fd=st->fd;
     fds[0].events=POLLIN;
     return 0;
@@ -116,8 +116,9 @@ 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,calculate_max_start_pad());
-	l=read(st->fd,st->buff->start,st->buff->len-calculate_max_start_pad());
+	l=read(st->fd, st->buff->start, buf_remaining_space(st->buff));
 	if (l<0) {
+	    if (errno==EINTR || iswouldblock(errno)) return;
 	    fatal_perror("tun_afterpoll: read()");
 	}
 	if (l==0) {
@@ -240,10 +241,8 @@ 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=up;
@@ -342,6 +341,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 */
@@ -352,6 +353,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. */
 
+    setcloexec(st->fd);
+    setnonblock(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);
@@ -438,8 +442,10 @@ static void tun_phase_hook(void *sst, uint32_t newphase)
 	tun_set_route(st,r);
     }
 
+    add_hook(PHASE_CHILDPERSIST,childpersist_closefd_hook,&st->fd);
+
     /* Register for poll() */
-    register_for_poll(st, tun_beforepoll, tun_afterpoll, 1, st->nl.name);
+    register_for_poll(st, tun_beforepoll, tun_afterpoll, st->nl.name);
 }
 
 static list_t *tun_create(closure_t *self, struct cloc loc, dict_t *context,
@@ -450,7 +456,7 @@ static list_t *tun_create(closure_t *self, struct cloc loc, dict_t *context,
     dict_t *dict;
     string_t flavour,type;
 
-    st=safe_malloc(sizeof(*st),"tun_apply");
+    NEW(st);
 
     /* First parameter must be a dict */
     item=list_elem(args,0);