string_item_to_iaddr: Actually set port if !CONFIG_IPV6

[secnet.git] / tun.c

diff --git a/tun.c b/tun.c
index 2c84ed0dace4d51a35c16071a7926e59859159be..d5e0e9e985e31eb615e0bcf5655d7c37f2116aab 100644 (file)
--- a/tun.c
+++ b/tun.c
@@ -442,6 +442,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 +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);