diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2015-11-27 11:30:41 +0100 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2015-11-27 14:41:20 +0100 |
| commit | 32b977a5336612a5c01f7426c4d165685fa8aca0 (patch) | |
| tree | 937fc48205929ecc28365e01e2be47b5477c3385 | |
| parent | 01d3f9d64486ac1daa144848944e877e7f0cb762 (diff) | |
| download | odhcpd-32b977a5336612a5c01f7426c4d165685fa8aca0.tar.gz | |
config: Close interface when ifindex cannot be resolved
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
| -rw-r--r-- | src/config.c | 4 | ||||
| -rw-r--r-- | src/router.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/config.c b/src/config.c index 7d870f1..4fc8bc7 100644 --- 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 9907824..9711975 100644 --- 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, |