do not override iface->autostart on config reload

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 435b485..506a478 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -157,6 +157,7 @@ interface_set_available(struct interface *iface, bool new_state)
        if (iface->available == new_state)
                return;
 
+       D(INTERFACE, "Interface '%s', available=%d\n", iface->name, new_state);
        iface->available = new_state;
 
        if (new_state) {
@@ -167,23 +168,56 @@ interface_set_available(struct interface *iface, bool new_state)
 }
 
 static void
-interface_do_free(struct interface *iface)
+interface_claim_device(struct interface *iface)
+{
+       struct device *dev;
+
+       if (iface->proto_handler &&
+               !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
+               dev = device_get(iface->ifname, true);
+               if (dev)
+                       device_add_user(&iface->main_dev, dev);
+       }
+}
+
+
+static void
+interface_cleanup(struct interface *iface)
 {
+       if (iface->main_dev.dev)
+               device_remove_user(&iface->main_dev);
        interface_set_proto_state(iface, NULL);
+}
+
+static void
+interface_do_free(struct interface *iface)
+{
+       interface_cleanup(iface);
        free(iface->config);
        netifd_ubus_remove_interface(iface);
        free(iface);
 }
 
 static void
+interface_do_reload(struct interface *iface)
+{
+       interface_cleanup(iface);
+
+       interface_claim_device(iface);
+       proto_init_interface(iface, iface->config);
+
+       if (iface->autostart)
+               interface_set_up(iface);
+}
+
+static void
 interface_handle_config_change(struct interface *iface)
 {
        switch(iface->config_state) {
        case IFC_NORMAL:
                break;
        case IFC_RELOAD:
-               if (iface->autostart)
-                       interface_set_up(iface);
+               interface_do_reload(iface);
                break;
        case IFC_REMOVE:
                interface_do_free(iface);
@@ -270,22 +304,13 @@ interface_add(struct interface *iface, struct blob_attr *config)
 {
        struct blob_attr *tb[IFACE_ATTR_MAX];
        struct blob_attr *cur;
-       struct device *dev;
 
        blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
                      blob_data(config), blob_len(config));
 
-       if ((cur = tb[IFACE_ATTR_IFNAME])) {
+       if ((cur = tb[IFACE_ATTR_IFNAME]))
                iface->ifname = blobmsg_data(cur);
 
-               if (iface->proto_handler &&
-                   !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
-                       dev = device_get(iface->ifname, true);
-                       if (dev)
-                               device_add_user(&iface->main_dev, dev);
-               }
-       }
-
        iface->config = config;
        vlist_add(&interfaces, &iface->node);
 }
@@ -367,7 +392,7 @@ set_config_state(struct interface *iface, enum interface_config_state s)
        if (iface->state == IFS_DOWN)
                interface_handle_config_change(iface);
        else
-               interface_set_down(iface);
+               __interface_set_down(iface, false);
 }
 
 static void
@@ -394,11 +419,15 @@ interface_update(struct vlist_tree *tree, struct vlist_node *node_new,
        struct interface *if_old = container_of(node_old, struct interface, node);
        struct interface *if_new = container_of(node_new, struct interface, node);
 
-       if (node_old && node_new)
+       if (node_old && node_new) {
+               D(INTERFACE, "Update interface '%s'\n", if_new->name);
                interface_change_config(if_old, if_new);
-       else if (node_old)
+       } else if (node_old) {
+               D(INTERFACE, "Remove interface '%s'\n", if_old->name);
                set_config_state(if_old, IFC_REMOVE);
-       else if (node_new) {
+       } else if (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);