convert interface event queueing to global interface notifier

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index b7c33b7..e43791c 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -12,6 +12,7 @@
 #include "system.h"
 
 struct vlist_tree interfaces;
+static LIST_HEAD(iface_all_users);
 
 enum {
        IFACE_ATTR_IFNAME,
@@ -122,9 +123,10 @@ interface_event(struct interface *iface, enum interface_event ev)
        struct interface_user *dep, *tmp;
 
        list_for_each_entry_safe(dep, tmp, &iface->users, list)
-               dep->cb(dep, IFEV_UP);
+               dep->cb(dep, iface, ev);
 
-       interface_queue_event(iface, ev);
+       list_for_each_entry_safe(dep, tmp, &iface_all_users, list)
+               dep->cb(dep, iface, ev);
 }
 
 static void
@@ -142,9 +144,10 @@ mark_interface_down(struct interface *iface)
 {
        if (iface->state == IFS_UP)
                interface_event(iface, IFEV_DOWN);
-       interface_flush_state(iface);
-       interface_ip_flush(&iface->config_ip);
+       interface_ip_set_enabled(&iface->config_ip, false);
        interface_ip_flush(&iface->proto_ip);
+       interface_flush_state(iface);
+       system_flush_routes();
        iface->state = IFS_DOWN;
 }
 
@@ -205,10 +208,15 @@ interface_set_available(struct interface *iface, bool new_state)
 void
 interface_add_user(struct interface_user *dep, struct interface *iface)
 {
+       if (!iface) {
+               list_add(&dep->list, &iface_all_users);
+               return;
+       }
+
        dep->iface = iface;
        list_add(&dep->list, &iface->users);
        if (iface->state == IFS_UP)
-               dep->cb(dep, IFEV_UP);
+               dep->cb(dep, iface, IFEV_UP);
 }
 
 void
@@ -242,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);
@@ -255,6 +262,7 @@ interface_cleanup(struct interface *iface, bool reload)
 static void
 interface_do_free(struct interface *iface)
 {
+       interface_event(iface, IFEV_FREE);
        interface_cleanup(iface, false);
        free(iface->config);
        netifd_ubus_remove_interface(iface);
@@ -265,6 +273,7 @@ interface_do_free(struct interface *iface)
 static void
 interface_do_reload(struct interface *iface)
 {
+       interface_event(iface, IFEV_RELOAD);
        interface_cleanup(iface, true);
        proto_init_interface(iface, iface->config);
        interface_claim_device(iface);
@@ -310,8 +319,6 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
                        return;
 
                netifd_log_message(L_NOTICE, "Interface '%s' is now down\n", iface->name);
-               interface_ip_set_enabled(&iface->config_ip, false);
-               system_flush_routes();
                mark_interface_down(iface);
                interface_handle_config_change(iface);
                break;
@@ -320,8 +327,7 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
                        return;
 
                netifd_log_message(L_NOTICE, "Interface '%s' has lost the connection\n", iface->name);
-               if (iface->state == IFS_UP)
-                       interface_event(iface, IFEV_DOWN);
+               mark_interface_down(iface);
                iface->state = IFS_SETUP;
                break;
        }
@@ -354,8 +360,7 @@ interface_init(struct interface *iface, const char *name,
        INIT_LIST_HEAD(&iface->errors);
        INIT_LIST_HEAD(&iface->users);
        INIT_LIST_HEAD(&iface->hotplug_list);
-       interface_ip_init(&iface->proto_ip, iface);
-       interface_ip_init(&iface->config_ip, iface);
+       interface_ip_init(iface);
        avl_init(&iface->data, avl_strcmp, false, NULL);
        iface->config_ip.enabled = false;
 
@@ -549,15 +554,7 @@ interface_update_start(struct interface *iface)
 void
 interface_update_complete(struct interface *iface)
 {
-       struct device_route *route;
-
        interface_ip_update_complete(&iface->proto_ip);
-       vlist_for_each_element(&iface->config_ip.route, route, node) {
-               if (iface->l3_dev.dev) {
-                       system_add_route(iface->l3_dev.dev, route);
-                       route->enabled = true;
-               }
-       }
 }
 
 static void