X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fconfig.c;h=f6a5327179228f03f61a2ba4c39b83495ca766b9;hp=baa857913b62b4bf30c44389ccd8ba1430b5640c;hb=b61c3f98223a264de219be37720b3bee5f19cf81;hpb=57e0e45970b8c1cf0d36ab07efd4c19d92529e85

diff --git a/src/config.c b/src/config.c
index baa8579..f6a5327 100644
--- a/src/config.c
+++ b/src/config.c
@@ -254,10 +254,10 @@ err:
 }
 
 
-int config_parse_interface(struct blob_attr *b, const char *name, bool overwrite)
+int config_parse_interface(void *data, size_t len, const char *name, bool overwrite)
 {
 	struct blob_attr *tb[IFACE_ATTR_MAX], *c;
-	blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(b), blob_len(b));
+	blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, data, len);
 
 	if (tb[IFACE_ATTR_INTERFACE])
 		name = blobmsg_get_string(tb[IFACE_ATTR_INTERFACE]);
@@ -276,7 +276,7 @@ int config_parse_interface(struct blob_attr *b, const char *name, bool overwrite
 
 	const char *ifname = NULL;
 #ifdef WITH_UBUS
-	if (overwrite)
+	if (overwrite || !iface->ifname[0])
 		ifname = ubus_get_ifname(name);
 #endif
 	if ((c = tb[IFACE_ATTR_IFNAME]))
@@ -284,10 +284,12 @@ int config_parse_interface(struct blob_attr *b, const char *name, bool overwrite
 	else if ((c = tb[IFACE_ATTR_NETWORKID]))
 		ifname = blobmsg_get_string(c);
 
-	if (!ifname)
+	if (!iface->ifname[0] && !ifname)
 		return -1;
 
-	strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
+	if (ifname)
+		strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
+
 	iface->inuse = true;
 
 	if (overwrite)
@@ -481,14 +483,21 @@ static int set_interface(struct uci_section *s)
 {
 	blob_buf_init(&b, 0);
 	uci_to_blob(&b, s, &interface_attr_list);
-	return config_parse_interface(b.head, s->e.name, true);
+	return config_parse_interface(blob_data(b.head), blob_len(b.head), s->e.name, true);
 }
 
 
 static volatile int do_reload = false;
+void odhcpd_reload(void)
+{
+	uloop_cancelled = true;
+	do_reload = true;
+}
+
+
 static void set_stop(int signal)
 {
-	uloop_end();
+	uloop_cancelled = true;
 	do_reload = (signal == SIGHUP);
 }
 
@@ -580,6 +589,7 @@ void odhcpd_run(void)
 				setup_dhcpv6_interface(i, true);
 				setup_ndp_interface(i, true);
 				setup_dhcpv4_interface(i, true);
+				i->inuse = false;
 			} else {
 				close_interface(i);
 			}