detect interface configuration changes

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index fa4b225..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)
@@ -184,6 +184,7 @@ interface_claim_device(struct interface *iface)
 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);
@@ -206,7 +207,7 @@ interface_do_reload(struct interface *iface)
        interface_claim_device(iface);
        proto_init_interface(iface, iface->config);
 
-       if (iface->autostart)
+       if (iface->autostart && !config_init)
                interface_set_up(iface);
 }
 
@@ -392,22 +393,47 @@ 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);
 }