config: Close interface when ifindex cannot be resolved

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

diff --git a/src/config.c b/src/config.c
index 7d870f129b27047a8eb8bb57c805908aee3f842f..4fc8bc7e738ad54fb147f870ac0515c790c28449 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -313,13 +313,13 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
        }
 
        if (!iface->ifname[0] && !ifname)
-               return -1;
+               goto err;
 
        if (ifname)
                strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
 
        if ((iface->ifindex = if_nametoindex(iface->ifname)) <= 0)
-               return -1;
+               goto err;
 
        iface->inuse = true;
 

diff --git a/src/router.c b/src/router.c
index 990782426967271a985eec10e558d95d76cb57b4..971197530918776d1f185dae9cab8a255fac5474 100644 (file)
--- a/src/router.c
+++ b/src/router.c
@@ -99,6 +99,9 @@ int setup_router_interface(struct interface *iface, bool enable)
        uloop_timeout_cancel(&iface->timer_rs);
        iface->timer_rs.cb = NULL;
 
+       if (iface->ifindex <= 0)
+               return -1;
+
        setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,
                        &all_nodes, sizeof(all_nodes));
        setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,