detect interface configuration changes

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 5b50314..b8b3fd1 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -31,7 +31,7 @@ const struct config_param_list interface_attr_list = {
 };
 
 static void
-clear_interface_errors(struct interface *iface)
+interface_clear_errors(struct interface *iface)
 {
        struct interface_error *error, *tmp;
 
@@ -119,7 +119,7 @@ __interface_set_up(struct interface *iface)
 static void
 __interface_set_down(struct interface *iface, bool force)
 {
-       clear_interface_errors(iface);
+       interface_clear_errors(iface);
 
        if (iface->state == IFS_DOWN ||
                iface->state == IFS_TEARDOWN)
@@ -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,57 @@ 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)
 {
+       interface_clear_errors(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 && !config_init)
+               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 +305,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,23 +393,49 @@ 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
 interface_change_config(struct interface *if_old, struct interface *if_new)
 {
        struct blob_attr *old_config = if_old->config;
+       const char *old_ifname = if_old->ifname;
+       const struct proto_handler *proto = if_old->proto_handler;
 
+       interface_clear_errors(if_old);
        if_old->config = if_new->config;
        if (!if_old->config_autostart && if_new->config_autostart)
                if_old->autostart = true;
 
        if_old->config_autostart = if_new->config_autostart;
        if_old->ifname = if_new->ifname;
+       if_old->proto_handler = if_new->proto_handler;
+
+       if (strcmp(old_ifname, if_new->ifname) != 0 ||
+               proto != if_new->proto_handler) {
+               D(INTERFACE, "Reload interface '%s' because of ifname/proto change\n",
+                 if_old->name);
+               goto reload;
+       }
+
+       if (!proto->config_params)
+               D(INTERFACE, "No config parameters for interface '%s'\n",
+                 if_old->name);
+       else if (!config_check_equal(old_config, if_new->config,
+                               proto->config_params)) {
+               D(INTERFACE, "Reload interface '%s because of config changes\n",
+                 if_old->name);
+               goto reload;
+       }
+
+       goto out;
 
+reload:
        set_config_state(if_old, IFC_RELOAD);
+out:
        free(old_config);
+       free(if_new);
 }
 
 static void
@@ -393,11 +445,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);
@@ -410,4 +466,6 @@ interface_init_list(void)
 {
        vlist_init(&interfaces, avl_strcmp, interface_update,
                   struct interface, node, name);
+       interfaces.keep_old = true;
+       interfaces.no_delete = true;
 }