do not clear device state for devices created by proto-up with address-external set

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 8e42f21..0f54d51 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -88,13 +88,17 @@ interface_event(struct interface *iface, enum interface_event ev)
 }
 
 static void
-mark_interface_down(struct interface *iface)
+interface_flush_state(struct interface *iface)
 {
-       interface_clear_dns(iface);
-       vlist_flush_all(&iface->proto_addr);
-       vlist_flush_all(&iface->proto_route);
+       interface_ip_flush(&iface->proto_ip);
        if (iface->main_dev.dev)
                device_release(&iface->main_dev);
+}
+
+static void
+mark_interface_down(struct interface *iface)
+{
+       interface_flush_state(iface);
        iface->state = IFS_DOWN;
 }
 
@@ -134,6 +138,8 @@ __interface_set_down(struct interface *iface, bool force)
        iface->state = IFS_TEARDOWN;
        interface_event(iface, IFEV_DOWN);
        interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
+       if (force)
+               interface_flush_state(iface);
 }
 
 static void
@@ -208,11 +214,11 @@ interface_cleanup(struct interface *iface)
 {
        struct interface_user *dep, *tmp;
 
-       iface->hotplug_dev = false;
        list_for_each_entry_safe(dep, tmp, &iface->users, list)
                interface_remove_user(dep);
 
-       interface_clear_dns(iface);
+       interface_ip_flush(&iface->config_ip);
+       interface_flush_state(iface);
        interface_clear_errors(iface);
        if (iface->main_dev.dev)
                device_remove_user(&iface->main_dev);
@@ -267,6 +273,7 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
                if (iface->state != IFS_SETUP)
                        return;
 
+               interface_ip_set_enabled(&iface->config_ip, true);
                system_flush_routes();
                iface->state = IFS_UP;
                iface->start_time = system_get_rtime();
@@ -279,6 +286,7 @@ 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);
@@ -325,8 +333,9 @@ interface_init(struct interface *iface, const char *name,
        INIT_LIST_HEAD(&iface->errors);
        INIT_LIST_HEAD(&iface->users);
        INIT_LIST_HEAD(&iface->hotplug_list);
-       INIT_LIST_HEAD(&iface->proto_dns_search);
-       INIT_LIST_HEAD(&iface->proto_dns_servers);
+       interface_ip_init(&iface->proto_ip, iface);
+       interface_ip_init(&iface->config_ip, iface);
+       iface->config_ip.enabled = false;
 
        iface->main_dev.cb = interface_cb;
        iface->l3_dev = &iface->main_dev;
@@ -443,6 +452,26 @@ set_config_state(struct interface *iface, enum interface_config_state s)
                __interface_set_down(iface, false);
 }
 
+void
+interface_update_start(struct interface *iface)
+{
+       interface_ip_update_start(&iface->proto_ip);
+}
+
+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
 interface_change_config(struct interface *if_old, struct interface *if_new)
 {
@@ -502,7 +531,6 @@ interface_update(struct vlist_tree *tree, struct vlist_node *node_new,
                D(INTERFACE, "Create interface '%s'\n", if_new->name);
                interface_claim_device(if_new);
                proto_init_interface(if_new, if_new->config);
-               interface_ip_init(if_new);
                netifd_ubus_add_interface(if_new);
        }
 }