X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-event.c;h=24af8f57ef67e76001ca819b1085e1bab7070950;hp=5ab6240e963b4ab3aa817604651c7c5dda7f53bf;hb=9d8dd091f8f336b111364ed211165b5ec9842a24;hpb=b7d1c27b752df3e6c5dfe6a5b789d6cb0c87d0f6;ds=sidebyside diff --git a/interface-event.c b/interface-event.c index 5ab6240..24af8f5 100644 --- a/interface-event.c +++ b/interface-event.c @@ -1,7 +1,19 @@ +/* + * netifd - network interface daemon + * Copyright (C) 2012 Felix Fietkau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ #include #include #include -#include #include @@ -18,9 +30,11 @@ 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 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; @@ -35,10 +49,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; @@ -57,11 +83,12 @@ call_hotplug(void) current_ev = current->hotplug_ev; list_del_init(¤t->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 @@ -80,29 +107,75 @@ task_complete(struct uloop_process *proc, int ret) * When queueing an event that is the same as the one waiting for * completion, remove the interface from the queue */ -void +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'\n", iface->name); - netifd_ubus_interface_event(iface, ev == IFEV_UP); - 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)) - list_add(&iface->hotplug_list, &pending); + 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); + + netifd_ubus_interface_notify(iface, ev != IFEV_DOWN); + + if (current == iface) { + /* an event for iface is being processed */ + if (!list_empty(&iface->hotplug_list)) { + /* an additional event for iface is pending */ + if ((ev != current_ev || ev == IFEV_UPDATE) && + !(iface->hotplug_ev == IFEV_UP && ev == IFEV_UPDATE)) { + /* if incoming event is different from the one + * being handled or if it is an update, + * overwrite pending event, but never + * overwrite an ifup with an ifupdate */ + iface->hotplug_ev = ev; + } + else if (ev == current_ev && ev != IFEV_UPDATE) { + /* if incoming event is not an ifupdate + * and is the same as the one that is + * being handled, remove it from the + * pending list */ + list_del_init(&iface->hotplug_list); + } + } + 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(); } -void +static void interface_dequeue_event(struct interface *iface) { if (iface == current) @@ -111,3 +184,28 @@ interface_dequeue_event(struct interface *iface) if (!list_empty(&iface->hotplug_list)) list_del_init(&iface->hotplug_list); } + +static void interface_event_cb(struct interface_user *dep, struct interface *iface, + enum interface_event ev) +{ + switch (ev) { + 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; + } +} + +static struct interface_user event_user = { + .cb = interface_event_cb +}; + +static void __init interface_event_init(void) +{ + interface_add_user(&event_user, NULL); +}