X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tun.c;h=3ba62b3880c1feb522022c7dca67a3b0c8bc8788;hb=4bc0381500403be5f3e40bc39f65a2d8fb75cf19;hp=2c84ed0dace4d51a35c16071a7926e59859159be;hpb=ba703386fd742f46f83430a7c48a9bfe53167eae;p=secnet.git

diff --git a/tun.c b/tun.c
index 2c84ed0..3ba62b3 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 3 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
@@ -442,6 +461,8 @@ 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, st->nl.name);
 }
@@ -454,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);