X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-event.c;h=3b0d1faca391bf0b89c1909f5477e2c08db18b45;hp=025c3c07077da578426e2466396de617422969b2;hb=37769eb666aa614b76df9b537db35c2c70e3ac7a;hpb=bfe5db1ea8018aaa940dc6e991110fac62b85516

diff --git a/interface-event.c b/interface-event.c
index 025c3c0..3b0d1fa 100644
--- a/interface-event.c
+++ b/interface-event.c
@@ -14,7 +14,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include <libubox/uloop.h>
 
@@ -33,7 +32,7 @@ static struct uloop_process task = {
 };
 
 static void
-run_cmd(const char *ifname, const char *device, bool up)
+run_cmd(const char *ifname, const char *device, enum interface_event event)
 {
 	char *argv[3];
 	int pid;
@@ -48,7 +47,8 @@ run_cmd(const char *ifname, const char *device, bool up)
 		return;
 	}
 
-	setenv("ACTION", up ? "ifup" : "ifdown", 1);
+	char *eventnames[] = {"ifdown", "ifup", "ifupdate"};
+	setenv("ACTION", eventnames[event], 1);
 	setenv("INTERFACE", ifname, 1);
 	if (device)
 		setenv("DEVICE", device, 1);
@@ -74,7 +74,7 @@ call_hotplug(void)
 		device = current->l3_dev.dev->ifname;
 
 	D(SYSTEM, "Call hotplug handler for interface '%s' (%s)\n", current->name, device ? device : "none");
-	run_cmd(current->name, device, current_ev == IFEV_UP);
+	run_cmd(current->name, device, current_ev);
 }
 
 static void
@@ -99,16 +99,20 @@ interface_queue_event(struct interface *iface, enum interface_event ev)
 	enum interface_event last_ev;
 
 	D(SYSTEM, "Queue hotplug handler for interface '%s'\n", iface->name);
-	netifd_ubus_interface_event(iface, ev == IFEV_UP);
+	if (ev == IFEV_UP || ev == IFEV_DOWN)
+		netifd_ubus_interface_event(iface, ev == IFEV_UP);
+
+	netifd_ubus_interface_notify(iface, ev != IFEV_DOWN);
+
 	if (current == iface)
 		last_ev = current_ev;
 	else
 		last_ev = iface->hotplug_ev;
 
 	iface->hotplug_ev = ev;
-	if (last_ev == ev && !list_empty(&iface->hotplug_list))
-		list_del(&iface->hotplug_list);
-	else if (last_ev != ev && list_empty(&iface->hotplug_list))
+	if ((last_ev == ev && ev != IFEV_UPDATE) && !list_empty(&iface->hotplug_list))
+		list_del_init(&iface->hotplug_list);
+	else if ((last_ev != ev || ev == IFEV_UPDATE) && list_empty(&iface->hotplug_list))
 		list_add(&iface->hotplug_list, &pending);
 
 	if (!task.pending && !current)
@@ -130,6 +134,7 @@ static void interface_event_cb(struct interface_user *dep, struct interface *ifa
 {
 	switch (ev) {
 		case IFEV_UP:
+		case IFEV_UPDATE:
 		case IFEV_DOWN:
 			interface_queue_event(iface, ev);
 			break;