Merge pull request openwrt#67 from dedeckeh/bugfixes

Fix interface ifname overwrite in case UCI dhcp section contains ifname or networkid parameter
sbyx · Nov 29, 2015 · c5cb116 · c5cb116
2 parents 01d3f9d + 045a620
commit c5cb116
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/config.c b/src/config.c
@@ -300,26 +300,26 @@ 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);
 		else if ((c = tb[IFACE_ATTR_NETWORKID]))
 			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
@@ -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,