interface: detect and handle changes in device config

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 444f3ac..f72d967 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -80,7 +80,7 @@ const struct uci_blob_param_list interface_attr_list = {
 };
 
 static void
-interface_clear_errors(struct interface *iface)
+interface_error_flush(struct interface *iface)
 {
        struct interface_error *error, *tmp;
 
@@ -90,6 +90,17 @@ interface_clear_errors(struct interface *iface)
        }
 }
 
+static void
+interface_clear_errors(struct interface *iface)
+{
+        /* don't flush the errors in case the configured protocol handler matches the
+           running protocol handler and is having the last error capability */
+       if (!(iface->proto &&
+              (iface->proto->handler->flags & PROTO_FLAG_LASTERROR) &&
+              (iface->proto->handler->name == iface->proto_handler->name)))
+               interface_error_flush(iface);
+}
+
 void interface_add_error(struct interface *iface, const char *subsystem,
                         const char *code, const char **data, int n_data)
 {
@@ -98,6 +109,14 @@ void interface_add_error(struct interface *iface, const char *subsystem,
        int *datalen = NULL;
        char *dest, *d_subsys, *d_code;
 
+        /* if the configured protocol handler has the last error support capability,
+           errors should only be added if the running protocol handler matches the
+           configured one */
+       if (iface->proto &&
+            (iface->proto->handler->flags & PROTO_FLAG_LASTERROR) &&
+            (iface->proto->handler->name != iface->proto_handler->name))
+               return;
+
        if (n_data) {
                len = n_data * sizeof(char *);
                datalen = alloca(len);
@@ -113,6 +132,11 @@ void interface_add_error(struct interface *iface, const char *subsystem,
        if (!error)
                return;
 
+       /* Only keep the last flagged error, prevent this list grows unlimitted in case the
+          protocol can't be established (e.g auth failure) */
+       if (iface->proto_handler->flags & PROTO_FLAG_LASTERROR)
+               interface_error_flush(iface);
+
        list_add_tail(&error->list, &iface->errors);
 
        dest = (char *) &error->data[n_data + 1];
@@ -188,6 +212,7 @@ interface_event(struct interface *iface, enum interface_event ev)
 
        switch (ev) {
        case IFEV_UP:
+               interface_error_flush(iface);
                adev = iface->l3_dev.dev;
                /* fall through */
        case IFEV_DOWN:
@@ -1016,6 +1041,35 @@ interface_replace_dns(struct interface_ip_settings *new, struct interface_ip_set
        vlist_simple_replace(&new->dns_search, &old->dns_search);
 }
 
+static bool
+interface_device_config_changed(struct interface *if_old, struct interface *if_new)
+{
+       struct blob_attr *ntb[__DEV_ATTR_MAX];
+       struct blob_attr *otb[__DEV_ATTR_MAX];
+       struct device *dev = if_old->main_dev.dev;
+       unsigned long diff;
+
+       BUILD_BUG_ON(sizeof(diff) < __DEV_ATTR_MAX / 8);
+
+       if (!dev)
+               return false;
+
+       if (if_old->device_config != if_new->device_config)
+               return true;
+
+       if (!if_new->device_config)
+               return false;
+
+       blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, otb,
+               blob_data(if_old->config), blob_len(if_old->config));
+
+       blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, ntb,
+               blob_data(if_new->config), blob_len(if_new->config));
+
+       uci_blob_diff(ntb, otb, &device_attr_list, &diff);
+       return diff;
+}
+
 static void
 interface_change_config(struct interface *if_old, struct interface *if_new)
 {
@@ -1033,6 +1087,9 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
                reload = true;
        }
 
+       if (!reload && interface_device_config_changed(if_old, if_new))
+               reload = true;
+
        if (FIELD_CHANGED_STR(ifname) ||
            if_old->proto_handler != if_new->proto_handler)
                reload = true;