interface: do not clear errors after an interface is marked as down, the user might...

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 3215f49..77654fe 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -80,6 +80,7 @@ void interface_add_error(struct interface *iface, const char *subsystem,
        int i, len = 0;
        int *datalen = NULL;
        char *dest;
+       int subsystem_len = 0, code_len = 0;
 
        if (n_data) {
                len = n_data * sizeof(char *);
@@ -90,13 +91,21 @@ void interface_add_error(struct interface *iface, const char *subsystem,
                }
        }
 
+       if (subsystem) {
+               subsystem_len = strlen(subsystem) + 1;
+               len += subsystem_len;
+       }
+
+       if (code) {
+               code_len = strlen(code) + 1;
+               len += code_len;
+       }
+
        error = calloc(1, sizeof(*error) + sizeof(char *) + len);
        if (!error)
                return;
 
        list_add_tail(&error->list, &iface->errors);
-       error->subsystem = subsystem;
-       error->code = code;
 
        dest = (char *) &error->data[n_data + 1];
        for (i = 0; i < n_data; i++) {
@@ -104,7 +113,20 @@ void interface_add_error(struct interface *iface, const char *subsystem,
                memcpy(dest, data[i], datalen[i]);
                dest += datalen[i];
        }
-       error->data[n_data] = NULL;
+       error->data[n_data++] = NULL;
+
+       dest = (char *) &error->data[n_data];
+       if (subsystem) {
+               error->subsystem = dest;
+               strcpy(dest, subsystem);
+               dest += subsystem_len;
+       }
+
+       if (code) {
+               error->code = dest;
+               strcpy(dest, code);
+               dest += code_len;
+       }
 }
 
 static void
@@ -147,19 +169,29 @@ static void
 interface_event(struct interface *iface, enum interface_event ev)
 {
        struct interface_user *dep, *tmp;
+       struct device *adev = NULL;
 
        list_for_each_entry_safe(dep, tmp, &iface->users, list)
                dep->cb(dep, iface, ev);
 
        list_for_each_entry_safe(dep, tmp, &iface_all_users, list)
                dep->cb(dep, iface, ev);
+
+       switch (ev) {
+       case IFEV_UP:
+               adev = iface->main_dev.dev;
+               /* fall through */
+       case IFEV_DOWN:
+               alias_notify_device(iface->name, adev);
+               break;
+       default:
+               break;
+       }
 }
 
 static void
 interface_flush_state(struct interface *iface)
 {
-       if (iface->main_dev.dev)
-               device_release(&iface->main_dev);
        if (iface->l3_dev.dev)
                device_release(&iface->l3_dev);
        interface_data_flush(iface);
@@ -182,8 +214,6 @@ mark_interface_down(struct interface *iface)
 void
 __interface_set_down(struct interface *iface, bool force)
 {
-       interface_clear_errors(iface);
-
        if (iface->state == IFS_DOWN ||
                iface->state == IFS_TEARDOWN)
                return;
@@ -215,6 +245,8 @@ interface_cb(struct device_user *dep, enum device_event ev)
        }
 
        interface_set_available(iface, new_state);
+       if (!new_state && dep->dev->external)
+               interface_set_main_dev(iface, NULL);
 }
 
 void
@@ -381,7 +413,6 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
                iface->state = IFS_UP;
                iface->start_time = system_get_rtime();
                interface_event(iface, IFEV_UP);
-               interface_write_resolv_conf();
                netifd_log_message(L_NOTICE, "Interface '%s' is now up\n", iface->name);
                break;
        case IFPEV_DOWN:
@@ -390,6 +421,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 
                netifd_log_message(L_NOTICE, "Interface '%s' is now down\n", iface->name);
                mark_interface_down(iface);
+               if (iface->main_dev.dev)
+                       device_release(&iface->main_dev);
                interface_handle_config_change(iface);
                break;
        case IFPEV_LINK_LOST:
@@ -401,6 +434,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
                iface->state = IFS_SETUP;
                break;
        }
+
+       interface_write_resolv_conf();
 }
 
 void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state)
@@ -682,6 +717,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
        if (!if_old->config_autostart && if_new->config_autostart)
                if_old->autostart = true;
 
+       if_old->device_config = if_new->device_config;
        if_old->config_autostart = if_new->config_autostart;
        if_old->ifname = if_new->ifname;
        if_old->parent_ifname = if_new->parent_ifname;