From 32b977a5336612a5c01f7426c4d165685fa8aca0 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Fri, 27 Nov 2015 11:30:41 +0100 Subject: config: Close interface when ifindex cannot be resolved Signed-off-by: Hans Dedecker --- src/config.c | 4 ++-- 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, -- cgit v1.2.1 From 045a6202903084c7053924f2cb40a95669fb139c Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Fri, 27 Nov 2015 13:34:01 +0100 Subject: config: Prioritize ifname resolving via ubus over ifname/networkid attributes Signed-off-by: Hans Dedecker --- src/config.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config.c b/src/config.c index 4fc8bc7..74ab3dd 100644 --- a/src/config.c +++ b/src/config.c @@ -300,11 +300,6 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr } const char *ifname = NULL; -#ifdef WITH_UBUS - if (overwrite || !iface->ifname[0]) - ifname = ubus_get_ifname(name); -#endif - if (overwrite) { if ((c = tb[IFACE_ATTR_IFNAME])) ifname = blobmsg_get_string(c); @@ -312,6 +307,11 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr ifname = blobmsg_get_string(c); } +#ifdef WITH_UBUS + if (overwrite || !iface->ifname[0]) + ifname = ubus_get_ifname(name); +#endif + if (!iface->ifname[0] && !ifname) goto err; -- cgit v1.2.1