X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-event.c;h=83ac6f771fbc33b2f816e24daa7e6111eae45a95;hp=ba7405a8410534b3ae4b90e7995f3e8c131e4a83;hb=1ba3b8a006b57646d55522bb9efa77769361ff39;hpb=13cc3e23d947b0d1a19c08cd031becd2ed866264 diff --git a/interface-event.c b/interface-event.c index ba7405a..83ac6f7 100644 --- a/interface-event.c +++ b/interface-event.c @@ -7,6 +7,7 @@ #include "netifd.h" #include "interface.h" +#include "ubus.h" char *hotplug_cmd_path = DEFAULT_HOTPLUG_PATH; static struct interface *current; @@ -19,7 +20,7 @@ static struct uloop_process task = { }; static void -run_cmd(const char *ifname, bool up) +run_cmd(const char *ifname, const char *device, bool up) { char *argv[3]; int pid; @@ -36,6 +37,8 @@ run_cmd(const char *ifname, bool up) setenv("ACTION", up ? "ifup" : "ifdown", 1); setenv("INTERFACE", ifname, 1); + if (device) + setenv("DEVICE", device, 1); argv[0] = hotplug_cmd_path; argv[1] = "network"; argv[2] = NULL; @@ -46,6 +49,7 @@ run_cmd(const char *ifname, bool up) static void call_hotplug(void) { + const char *device = NULL; if (list_empty(&pending)) return; @@ -53,8 +57,11 @@ call_hotplug(void) current_ev = current->hotplug_ev; list_del_init(¤t->hotplug_list); - D(SYSTEM, "Call hotplug handler for interface '%s'\n", current->name); - run_cmd(current->name, current_ev == IFEV_UP); + if (current_ev == IFEV_UP && 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); } static void @@ -79,6 +86,7 @@ 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 (current == iface) last_ev = current_ev; else