convert interface event queueing to global interface notifier

[project/netifd.git] / interface-event.c

diff --git a/interface-event.c b/interface-event.c
index 4e0773d..8a92ee7 100644 (file)
--- a/interface-event.c
+++ b/interface-event.c
@@ -57,8 +57,8 @@ call_hotplug(void)
        current_ev = current->hotplug_ev;
        list_del_init(&current->hotplug_list);
 
        current_ev = current->hotplug_ev;
        list_del_init(&current->hotplug_list);
 

-       if (current_ev == IFEV_UP && current->l3_dev->dev)
-               device = current->l3_dev->dev->ifname;
+       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);
 
        D(SYSTEM, "Call hotplug handler for interface '%s' (%s)\n", current->name, device ? device : "none");
        run_cmd(current->name, device, current_ev == IFEV_UP);


@@ -80,7 +80,7 @@ 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
  */
  * 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;
 interface_queue_event(struct interface *iface, enum interface_event ev)
 {
        enum interface_event last_ev;


@@ -102,7 +102,7 @@ interface_queue_event(struct interface *iface, enum interface_event ev)
                call_hotplug();
 }
 
                call_hotplug();
 }
 

-void
+static void

 interface_dequeue_event(struct interface *iface)
 {
        if (iface == current)
 interface_dequeue_event(struct interface *iface)
 {
        if (iface == current)


@@ -111,3 +111,27 @@ interface_dequeue_event(struct interface *iface)
        if (!list_empty(&iface->hotplug_list))
                list_del_init(&iface->hotplug_list);
 }
        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_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);
+}