convert interface event queueing to global interface notifier

diff --git a/interface-event.c b/interface-event.c
index 5ab6240e963b4ab3aa817604651c7c5dda7f53bf..8a92ee793e6d6e5e94a4e3daf5906dcf87f52726 100644 (file)
--- a/interface-event.c
+++ b/interface-event.c
@@ -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
  */
-void
+static void
 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();
 }
 
-void
+static void
 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);
 }
+
+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);
+}

diff --git a/interface.c b/interface.c
index 892dadef30c60c4169725cbecb371c120057e59d..e43791cf5ba48f45038486f29c4c2ea772f305e5 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -127,8 +127,6 @@ interface_event(struct interface *iface, enum interface_event ev)
 
        list_for_each_entry_safe(dep, tmp, &iface_all_users, list)
                dep->cb(dep, iface, ev);
-
-       interface_queue_event(iface, ev);
 }
 
 static void
@@ -252,7 +250,6 @@ interface_cleanup(struct interface *iface, bool reload)
        list_for_each_entry_safe(dep, tmp, &iface->users, list)
                interface_remove_user(dep);
 
-       interface_dequeue_event(iface);
        interface_ip_flush(&iface->config_ip);
        interface_flush_state(iface);
        interface_clear_errors(iface);

diff --git a/interface.h b/interface.h
index 4b4326a8b7097ce12a09a778ffac2252eaaa9e65..bfdc28e4c7d8309bae0abcb44805d7cfcf42eece 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -139,9 +139,6 @@ int interface_add_data(struct interface *iface, const struct blob_attr *data);
 void interface_update_start(struct interface *iface);
 void interface_update_complete(struct interface *iface);
 
-void interface_queue_event(struct interface *iface, enum interface_event ev);
-void interface_dequeue_event(struct interface *iface);
-
 void interface_start_pending(void);
 
 #endif