X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/4fb0f88d53fc60395a4a87b7a9ca1245ba033ee7..1fc8a4acb3ef658696038c9c4bd3c155fbc27ac3:/tun.c

diff --git a/tun.c b/tun.c
index ffc195c..afb97d1 100644
--- a/tun.c
+++ b/tun.c
@@ -1,3 +1,22 @@
+/*
+ * This file is part of secnet.
+ * See README for full list of copyright holders.
+ *
+ * secnet is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version d of the License, or
+ * (at your option) any later version.
+ * 
+ * secnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with secnet; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ */
+
 #include "secnet.h"
 #include "util.h"
 #include "netlink.h"
@@ -12,7 +31,7 @@
 
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
-#ifdef HAVE_LINUX_IF_H
+#ifdef HAVE_LINUX_IF_TUN_H
 #include <linux/if_tun.h>
 #define LINUX_TUN_SUPPORTED
 #endif
@@ -98,7 +117,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;
@@ -118,6 +137,7 @@ static void tun_afterpoll(void *sst, struct pollfd *fds, int nfds)
 	buffer_init(st->buff,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) {
@@ -241,7 +261,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;
@@ -353,6 +373,7 @@ static void tun_phase_hook(void *sst, uint32_t newphase)
        our networks. */
 
     setcloexec(st->fd);
+    setnonblock(st->fd);
 
     hostaddr=ipaddr_to_string(st->nl.local_address);
     secnetaddr=ipaddr_to_string(st->nl.secnet_address);
@@ -440,8 +461,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,
@@ -452,7 +475,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);