X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-event.c;h=4976c2cf032d6b3bc25069f03398aefd454f3d50;hp=c6fe1cab877f0faa185a61e7ae81244e13d470b3;hb=b8ef742bd04ebef324ae11aee56c6e1d2cb7e0ad;hpb=c346857597f5e8d9a95f51a7080b9df987ac5983

diff --git a/interface-event.c b/interface-event.c
index c6fe1ca..4976c2c 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>
 
@@ -31,9 +30,18 @@ static void task_complete(struct uloop_process *proc, int ret);
 static struct uloop_process task = {
 	.cb = task_complete,
 };
+static const char * const eventnames[] = {
+	[IFEV_DOWN] = "ifdown",
+	[IFEV_UP] = "ifup",
+	[IFEV_UPDATE] = "ifupdate",
+	[IFEV_FREE] = "free",
+	[IFEV_RELOAD] = "reload",
+	[IFEV_LINK_UP] = "iflink",
+};
 
 static void
-run_cmd(const char *ifname, const char *device, bool up)
+run_cmd(const char *ifname, const char *device, enum interface_event event,
+		enum interface_update_flags updated)
 {
 	char *argv[3];
 	int pid;
@@ -48,10 +56,22 @@ run_cmd(const char *ifname, const char *device, bool up)
 		return;
 	}
 
-	setenv("ACTION", up ? "ifup" : "ifdown", 1);
+	setenv("ACTION", eventnames[event], 1);
 	setenv("INTERFACE", ifname, 1);
 	if (device)
 		setenv("DEVICE", device, 1);
+
+	if (event == IFEV_UPDATE) {
+		if (updated & IUF_ADDRESS)
+			setenv("IFUPDATE_ADDRESSES", "1", 1);
+		if (updated & IUF_ROUTE)
+			setenv("IFUPDATE_ROUTES", "1", 1);
+		if (updated & IUF_PREFIX)
+			setenv("IFUPDATE_PREFIXES", "1", 1);
+		if (updated & IUF_DATA)
+			setenv("IFUPDATE_DATA", "1", 1);
+	}
+
 	argv[0] = hotplug_cmd_path;
 	argv[1] = "iface";
 	argv[2] = NULL;
@@ -70,11 +90,12 @@ call_hotplug(void)
 	current_ev = current->hotplug_ev;
 	list_del_init(&current->hotplug_list);
 
-	if (current_ev == IFEV_UP && current->l3_dev.dev)
+	if ((current_ev == IFEV_UP || current_ev == IFEV_UPDATE) && current->l3_dev.dev)
 		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);
+	D(SYSTEM, "Call hotplug handler for interface '%s', event '%s' (%s)\n",
+	current->name, eventnames[current_ev], device ? device : "none");
+	run_cmd(current->name, device, current_ev, current->updated);
 }
 
 static void
@@ -96,20 +117,59 @@ task_complete(struct uloop_process *proc, int ret)
 static void
 interface_queue_event(struct interface *iface, enum interface_event ev)
 {
-	enum interface_event last_ev;
+	D(SYSTEM, "Queue hotplug handler for interface '%s', event '%s'\n",
+			iface->name, eventnames[ev]);
+	if (ev == IFEV_UP || ev == IFEV_DOWN)
+		netifd_ubus_interface_event(iface, ev == IFEV_UP);
 
-	D(SYSTEM, "Queue hotplug handler for interface '%s'\n", iface->name);
-	netifd_ubus_interface_event(iface, ev == IFEV_UP);
-	if (current == iface)
-		last_ev = current_ev;
-	else
-		last_ev = iface->hotplug_ev;
+	netifd_ubus_interface_notify(iface, ev != IFEV_DOWN);
 
-	iface->hotplug_ev = ev;
-	if (last_ev == ev && !list_empty(&iface->hotplug_list))
-		list_del_init(&iface->hotplug_list);
-	else if (last_ev != ev && list_empty(&iface->hotplug_list))
-		list_add(&iface->hotplug_list, &pending);
+	/* no hotplug.d calls for link up */
+	if (ev == IFEV_LINK_UP)
+		return;
+
+	if (current == iface) {
+		/* an event for iface is being processed */
+		if (!list_empty(&iface->hotplug_list)) {
+			/* an additional event for iface is pending   */
+			/* overwrite pending event if it differs from */
+			/* an update                                  */
+			if (ev != IFEV_UPDATE)
+				iface->hotplug_ev = ev;
+		}
+		else {
+			/* no additional event for iface is pending */
+			if (ev != current_ev || ev == IFEV_UPDATE) {
+				/* only add the interface to the pending list if
+				 * the event is different from the one being
+				 * handled or if it is an update */
+				iface->hotplug_ev = ev;
+				/* Handle hotplug calls FIFO */
+				list_add_tail(&iface->hotplug_list, &pending);
+			}
+		}
+	}
+	else {
+		/* currently not handling an event or handling an event
+		 * for another interface */
+		if (!list_empty(&iface->hotplug_list)) {
+			/* an event for iface is pending */
+			if (!(iface->hotplug_ev == IFEV_UP &&
+				ev == IFEV_UPDATE)) {
+				/* overwrite pending event, unless the incoming
+				 * event is an ifupdate while the pending one
+				 * is an ifup */
+				iface->hotplug_ev = ev;
+			}
+		}
+		else {
+			/* an event for the interface is not yet pending,
+			 * queue it */
+			iface->hotplug_ev = ev;
+			/* Handle hotplug calls FIFO */
+			list_add_tail(&iface->hotplug_list, &pending);
+		}
+	}
 
 	if (!task.pending && !current)
 		call_hotplug();
@@ -129,14 +189,17 @@ static void interface_event_cb(struct interface_user *dep, struct interface *ifa
 			       enum interface_event ev)
 {
 	switch (ev) {
+		case IFEV_LINK_UP:
 		case IFEV_UP:
+		case IFEV_UPDATE:
 		case IFEV_DOWN:
 			interface_queue_event(iface, ev);
 			break;
 		case IFEV_FREE:
-		case IFEV_RELOAD:
 			interface_dequeue_event(iface);
 			break;
+		default:
+			break;
 	}
 }