X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-event.c;h=4976c2cf032d6b3bc25069f03398aefd454f3d50;hp=cfbc15c2bd5bcf3008a798949b08804e79e2e799;hb=b8ef742bd04ebef324ae11aee56c6e1d2cb7e0ad;hpb=5a0909caaff498d61b5cf17162fd0c5c5b381b8b diff --git a/interface-event.c b/interface-event.c index cfbc15c..4976c2c 100644 --- a/interface-event.c +++ b/interface-event.c @@ -30,7 +30,14 @@ static void task_complete(struct uloop_process *proc, int ret); static struct uloop_process task = { .cb = task_complete, }; -static const char * const eventnames[] = {"ifdown", "ifup", "ifupdate"}; +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, enum interface_event event, @@ -117,6 +124,10 @@ interface_queue_event(struct interface *iface, enum interface_event ev) netifd_ubus_interface_notify(iface, ev != IFEV_DOWN); + /* 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)) { @@ -178,15 +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; } }