diff options
| author | Steven Barth <steven@midlink.org> | 2015-11-29 12:51:28 +0100 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2015-11-29 12:51:28 +0100 |
| commit | c5cb11650a1f7ff321b4ac190c8be7f533cf9636 (patch) | |
| tree | 387e68fe4207c920d30c295fb5cb620b9ea95154 | |
| parent | 01d3f9d64486ac1daa144848944e877e7f0cb762 (diff) | |
| parent | 045a6202903084c7053924f2cb40a95669fb139c (diff) | |
| download | odhcpd-c5cb11650a1f7ff321b4ac190c8be7f533cf9636.tar.gz | |
Merge pull request #67 from dedeckeh/bugfixes
Fix interface ifname overwrite in case UCI dhcp section contains ifname or networkid parameter
| -rw-r--r-- | src/config.c | 14 | ||||
| -rw-r--r-- | src/router.c | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/config.c b/src/config.c index 7d870f1..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,14 +307,19 @@ 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) - 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, |