move route interface assignment to the vlist update

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index f281a9b..10a9174 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -81,6 +81,42 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 }
 
 static void
+interface_data_del(struct interface *iface, struct interface_data *data)
+{
+       avl_delete(&iface->data, &data->node);
+       free(data);
+}
+
+static void
+interface_data_flush(struct interface *iface)
+{
+       struct interface_data *d, *tmp;
+
+       avl_for_each_element_safe(&iface->data, d, node, tmp)
+               interface_data_del(iface, d);
+}
+
+int
+interface_add_data(struct interface *iface, const struct blob_attr *data)
+{
+       struct interface_data *n, *o;
+
+       if (!blobmsg_check_attr(data, true))
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       n = calloc(1, sizeof(*data) + blob_pad_len(data));
+       memcpy(n->data, data, blob_pad_len(data));
+       n->node.key = blobmsg_name(data);
+
+       o = avl_find_element(&iface->data, n->node.key, o, node);
+       if (o)
+               interface_data_del(iface, o);
+
+       avl_insert(&iface->data, &n->node);
+       return 0;
+}
+
+static void
 interface_event(struct interface *iface, enum interface_event ev)
 {
        struct interface_user *dep, *tmp;
@@ -94,11 +130,11 @@ interface_event(struct interface *iface, enum interface_event ev)
 static void
 interface_flush_state(struct interface *iface)
 {
-       interface_ip_flush(&iface->proto_ip);
        if (iface->main_dev.dev)
                device_release(&iface->main_dev);
-       if (iface->l3_dev != &iface->main_dev && iface->l3_dev->dev)
-               device_release(iface->l3_dev);
+       if (iface->l3_dev.dev)
+               device_release(&iface->l3_dev);
+       interface_data_flush(iface);
 }
 
 static void
@@ -106,7 +142,10 @@ mark_interface_down(struct interface *iface)
 {
        if (iface->state == IFS_UP)
                interface_event(iface, IFEV_DOWN);
+       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;
 }
 
@@ -122,8 +161,6 @@ __interface_set_down(struct interface *iface, bool force)
        if (iface->state == IFS_UP)
                interface_event(iface, IFEV_DOWN);
        iface->state = IFS_TEARDOWN;
-       interface_ip_flush(&iface->config_ip);
-       interface_ip_flush(&iface->proto_ip);
        interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
        if (force)
                interface_flush_state(iface);
@@ -191,7 +228,7 @@ interface_claim_device(struct interface *iface)
                !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
                dev = device_get(iface->ifname, true);
                if (dev)
-                       device_add_user(&iface->main_dev, dev);
+                       interface_set_main_dev(iface, dev);
        }
        if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE)
                interface_set_available(iface, true);
@@ -206,13 +243,13 @@ 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);
        if (iface->main_dev.dev &&
            (!reload || !iface->main_dev.hotplug))
-               device_remove_user(&iface->main_dev);
-       iface->l3_dev = &iface->main_dev;
+               interface_set_main_dev(iface, NULL);
        interface_set_proto_state(iface, NULL);
 }
 
@@ -274,8 +311,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;
@@ -284,8 +319,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;
        }
@@ -320,10 +354,10 @@ interface_init(struct interface *iface, const char *name,
        INIT_LIST_HEAD(&iface->hotplug_list);
        interface_ip_init(&iface->proto_ip, iface);
        interface_ip_init(&iface->config_ip, iface);
+       avl_init(&iface->data, avl_strcmp, false, NULL);
        iface->config_ip.enabled = false;
 
        iface->main_dev.cb = interface_cb;
-       iface->l3_dev = &iface->main_dev;
 
        blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
                      blob_data(config), blob_len(config));
@@ -356,6 +390,46 @@ interface_add(struct interface *iface, struct blob_attr *config)
        vlist_add(&interfaces, &iface->node, iface->name);
 }
 
+void
+interface_set_l3_dev(struct interface *iface, struct device *dev)
+{
+       bool enabled = iface->config_ip.enabled;
+       bool claimed = iface->l3_dev.claimed;
+
+       if (iface->l3_dev.dev == dev)
+               return;
+
+       interface_ip_set_enabled(&iface->config_ip, false);
+       interface_ip_flush(&iface->proto_ip);
+       device_add_user(&iface->l3_dev, dev);
+
+       if (dev) {
+               if (claimed)
+                       device_claim(&iface->l3_dev);
+               interface_ip_set_enabled(&iface->config_ip, enabled);
+       }
+}
+
+void
+interface_set_main_dev(struct interface *iface, struct device *dev)
+{
+       bool set_l3 = (iface->main_dev.dev == iface->l3_dev.dev);
+       bool claimed = iface->l3_dev.claimed;
+
+       if (iface->main_dev.dev == dev)
+               return;
+
+       if (set_l3)
+               interface_set_l3_dev(iface, dev);
+
+       device_add_user(&iface->main_dev, dev);
+       if (claimed)
+               device_claim(&iface->l3_dev);
+
+       if (!iface->l3_dev.dev)
+               interface_set_l3_dev(iface, dev);
+}
+
 int
 interface_remove_link(struct interface *iface, struct device *dev)
 {
@@ -392,7 +466,7 @@ interface_add_link(struct interface *iface, struct device *dev)
                        return UBUS_STATUS_NOT_SUPPORTED;
        }
 
-       device_add_user(&iface->main_dev, dev);
+       interface_set_main_dev(iface, dev);
        iface->main_dev.hotplug = true;
        return 0;
 }
@@ -473,15 +547,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