Handle reload mechanism

[project/odhcpd.git] / src / ubus.c

diff --git a/src/ubus.c b/src/ubus.c
index 55f52dc..2876eb9 100644 (file)
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -182,7 +182,7 @@ static void handle_dump(_unused struct ubus_request *req, _unused int type, stru
 
        free(dump);
        dump = blob_memdup(tb[DUMP_ATTR_INTERFACE]);
-       raise(SIGHUP);
+       odhcpd_reload();
 }
 
 
@@ -213,7 +213,6 @@ static int handle_update(_unused struct ubus_context *ctx, _unused struct ubus_o
 
 static void subscribe_netifd(void)
 {
-       netifd.cb = handle_update;
        ubus_subscribe(ubus, &netifd, objid);
        ubus_invoke(ubus, objid, "dump", NULL, handle_dump, NULL, 0);
 }
@@ -239,18 +238,25 @@ void ubus_apply_network(void)
                const char *ifname = (tb[IFACE_ATTR_IFNAME]) ?
                                blobmsg_get_string(tb[IFACE_ATTR_IFNAME]) : "";
 
+               bool matched = false;
                struct interface *c;
                list_for_each_entry(c, &interfaces, head) {
                        char *f = memmem(c->upstream, c->upstream_len,
                                        interface, strlen(interface) + 1);
-                       if (strcmp(interface, c->name) && strcmp(ifname, c->ifname) &&
-                                       (!f || (f != c->upstream && f[-1] != 0)))
+                       bool cmatched = !strcmp(interface, c->name) || !strcmp(ifname, c->ifname);
+                       matched |= cmatched;
+
+                       if (!cmatched && (!f || (f != c->upstream && f[-1] != 0)))
                                continue;
 
-                       if (!c || !c->ignore)
+                       if (!c->ignore)
                                config_parse_interface(blobmsg_data(tb[IFACE_ATTR_DATA]),
-                                               blobmsg_data_len(tb[IFACE_ATTR_DATA]), interface, false);
+                                               blobmsg_data_len(tb[IFACE_ATTR_DATA]), c->name, false);
                }
+
+               if (!matched)
+                       config_parse_interface(blobmsg_data(tb[IFACE_ATTR_DATA]),
+                                       blobmsg_data_len(tb[IFACE_ATTR_DATA]), interface, false);
        }
 }
 
@@ -353,6 +359,9 @@ int init_ubus(void)
                return -1;
        }
 
+       netifd.cb = handle_update;
+       ubus_register_subscriber(ubus, &netifd);
+
        ubus_add_uloop(ubus);
        ubus_add_object(ubus, &main_object);
        ubus_register_event_handler(ubus, &event_handler, "ubus.object.add");