netifd: Fix possible hotplug race conditions

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index ed60959..72599e6 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -43,6 +43,7 @@ enum {
        IFACE_ATTR_IP6TABLE,
        IFACE_ATTR_IP6CLASS,
        IFACE_ATTR_DELEGATE,
+       IFACE_ATTR_IP6IFACEID,
        IFACE_ATTR_FORCE_LINK,
        IFACE_ATTR_MAX
 };
@@ -63,6 +64,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [IFACE_ATTR_IP6TABLE] = { .name = "ip6table", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_IP6CLASS] = { .name = "ip6class", .type = BLOBMSG_TYPE_ARRAY },
        [IFACE_ATTR_DELEGATE] = { .name = "delegate", .type = BLOBMSG_TYPE_BOOL },
+       [IFACE_ATTR_IP6IFACEID] = { .name = "ip6ifaceid", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_FORCE_LINK] = { .name = "force_link", .type = BLOBMSG_TYPE_BOOL },
 };
 
@@ -271,12 +273,16 @@ interface_check_state(struct interface *iface)
 
        switch (iface->state) {
        case IFS_UP:
+       case IFS_SETUP:
                if (!iface->enabled || !link_state) {
-                       mark_interface_down(iface);
                        interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
+                       mark_interface_down(iface);
                }
                break;
        case IFS_DOWN:
+               if (!iface->available)
+                       return;
+
                if (iface->autostart && iface->enabled && link_state && !config_init)
                        __interface_set_up(iface);
                break;
@@ -419,6 +425,10 @@ interface_merge_assignment_data(struct interface *old, struct interface *new)
 {
        bool changed = (old->assignment_hint != new->assignment_hint ||
                        old->assignment_length != new->assignment_length ||
+                       old->assignment_iface_id_selection != new->assignment_iface_id_selection ||
+                       (old->assignment_iface_id_selection == IFID_FIXED &&
+                        memcmp(&old->assignment_fixed_iface_id, &new->assignment_fixed_iface_id,
+                               sizeof(old->assignment_fixed_iface_id))) ||
                        list_empty(&old->assignment_classes) != list_empty(&new->assignment_classes));
 
        struct interface_assignment_class *c;
@@ -451,6 +461,8 @@ interface_merge_assignment_data(struct interface *old, struct interface *new)
        if (changed) {
                old->assignment_hint = new->assignment_hint;
                old->assignment_length = new->assignment_length;
+               old->assignment_iface_id_selection = new->assignment_iface_id_selection;
+               old->assignment_fixed_iface_id = new->assignment_fixed_iface_id;
                interface_refresh_assignments(true);
        }
 }
@@ -498,6 +510,8 @@ interface_claim_device(struct interface *iface)
        } else if (iface->ifname &&
                !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
                dev = device_get(iface->ifname, true);
+               if (dev && dev->default_config && iface->device_config)
+                       device_apply_config(dev, dev->type, iface->config);
        } else {
                dev = iface->ext_dev.dev;
        }
@@ -527,6 +541,7 @@ interface_cleanup(struct interface *iface)
 {
        struct interface_user *dep, *tmp;
 
+       uloop_timeout_cancel(&iface->remove_timer);
        device_remove_user(&iface->ext_dev);
 
        if (iface->parent_iface.iface)
@@ -696,6 +711,33 @@ interface_alloc(const char *name, struct blob_attr *config)
        if ((cur = tb[IFACE_ATTR_IP6ASSIGN]))
                iface->assignment_length = blobmsg_get_u32(cur);
 
+       /* defaults */
+       iface->assignment_iface_id_selection = IFID_FIXED;
+       iface->assignment_fixed_iface_id = in6addr_any;
+       iface->assignment_fixed_iface_id.s6_addr[15] = 1;
+
+       if ((cur = tb[IFACE_ATTR_IP6IFACEID])) {
+               const char *ifaceid = blobmsg_data(cur);
+               if (!strcmp(ifaceid, "random")) {
+                       iface->assignment_iface_id_selection = IFID_RANDOM;
+               }
+               else if (!strcmp(ifaceid, "eui64")) {
+                       iface->assignment_iface_id_selection = IFID_EUI64;
+               }
+               else {
+                       /* we expect an IPv6 address with network id zero here -> fixed iface id
+                          if we cannot parse -> revert to iface id 1 */
+                       if (inet_pton(AF_INET6,ifaceid,&iface->assignment_fixed_iface_id) != 1 ||
+                                       iface->assignment_fixed_iface_id.s6_addr32[0] != 0 ||
+                                       iface->assignment_fixed_iface_id.s6_addr32[1] != 0) {
+                               iface->assignment_fixed_iface_id = in6addr_any;
+                               iface->assignment_fixed_iface_id.s6_addr[15] = 1;
+                               netifd_log_message(L_WARNING, "Failed to parse ip6ifaceid for interface '%s', \
+                                                       falling back to iface id 1.\n", iface->name);
+                       }
+               }
+       }
+
        iface->assignment_hint = -1;
        if ((cur = tb[IFACE_ATTR_IP6HINT]))
                iface->assignment_hint = strtol(blobmsg_get_string(cur), NULL, 16) &
@@ -835,8 +877,8 @@ interface_remove_link(struct interface *iface, struct device *dev)
        return 0;
 }
 
-int
-interface_add_link(struct interface *iface, struct device *dev)
+static int
+interface_add_link(struct interface *iface, struct device *dev, bool link_ext)
 {
        struct device *mdev = iface->main_dev.dev;
 
@@ -853,21 +895,23 @@ interface_add_link(struct interface *iface, struct device *dev)
                        return UBUS_STATUS_NOT_SUPPORTED;
        }
 
-       device_add_user(&iface->ext_dev, dev);
+       if (link_ext)
+               device_add_user(&iface->ext_dev, dev);
+
        interface_set_main_dev(iface, dev);
        iface->main_dev.hotplug = true;
        return 0;
 }
 
 int
-interface_handle_link(struct interface *iface, const char *name, bool add)
+interface_handle_link(struct interface *iface, const char *name, bool add, bool link_ext)
 {
        struct device *dev;
        int ret;
 
        device_lock();
 
-       dev = device_get(name, add ? 2 : 0);
+       dev = device_get(name, add ? (link_ext ? 2 : 1) : 0);
        if (!dev) {
                ret = UBUS_STATUS_NOT_FOUND;
                goto out;
@@ -875,11 +919,11 @@ interface_handle_link(struct interface *iface, const char *name, bool add)
 
        if (add) {
                device_set_present(dev, true);
-               if (iface->device_config)
-                       device_set_config(dev, &simple_device_type, iface->config);
+               if (iface->device_config && dev->default_config)
+                       device_set_config(dev, dev->type, iface->config);
 
                system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
-               ret = interface_add_link(iface, dev);
+               ret = interface_add_link(iface, dev, link_ext);
        } else {
                ret = interface_remove_link(iface, dev);
        }
@@ -1007,8 +1051,12 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
        })
 
        if_old->config = if_new->config;
-       if (!if_old->config_autostart && if_new->config_autostart)
-               if_old->autostart = true;
+       if (if_old->config_autostart != if_new->config_autostart) {
+               if (if_old->config_autostart)
+                       reload = true;
+
+               if_old->autostart = if_new->config_autostart;
+       }
 
        if_old->device_config = if_new->device_config;
        if_old->config_autostart = if_new->config_autostart;
@@ -1037,10 +1085,13 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
        }
 
        if (reload_ip) {
+               bool config_ip_enabled = if_old->config_ip.enabled;
+               bool proto_ip_enabled = if_old->proto_ip.enabled;
+
                interface_ip_set_enabled(&if_old->config_ip, false);
                interface_ip_set_enabled(&if_old->proto_ip, false);
-               interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled);
-               interface_ip_set_enabled(&if_old->config_ip, if_new->config_ip.enabled);
+               interface_ip_set_enabled(&if_old->proto_ip, proto_ip_enabled);
+               interface_ip_set_enabled(&if_old->config_ip, config_ip_enabled);
        }
 
        interface_write_resolv_conf();