X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/927950400bd569326c3babf4e29038523fa464a6..d613fd78298a9911b7917c06f3ea11de45462e76:/tun.c

diff --git a/tun.c b/tun.c
index d4070f2..102a24c 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;
@@ -241,7 +241,7 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes)
 	    break;
 	}
     }
-    if (st->route_type==TUN_CONFIG_IOCTL) {
+    if (fd >= 0) {
 	close(fd);
     }
     routes->kup=up;
@@ -340,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 */
@@ -350,6 +352,8 @@ 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);
+
     hostaddr=ipaddr_to_string(st->nl.local_address);
     secnetaddr=ipaddr_to_string(st->nl.secnet_address);
     snprintf(mtu,sizeof(mtu),"%d",st->nl.mtu);