bridge: fix retrying member enable when the bridge is otherwise empty
[project/netifd.git] / device.c
index 91a7867..6eb1486 100644 (file)
--- a/device.c
+++ b/device.c
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 static struct avl_tree devices;
 
 static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
-       [DEV_ATTR_TYPE] = { "type", BLOBMSG_TYPE_STRING },
-       [DEV_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
-       [DEV_ATTR_IFNAME] = { "ifname", BLOBMSG_TYPE_ARRAY },
-       [DEV_ATTR_MTU] = { "mtu", BLOBMSG_TYPE_INT32 },
-       [DEV_ATTR_MACADDR] = { "macaddr", BLOBMSG_TYPE_STRING },
-       [DEV_ATTR_TXQUEUELEN] = { "txqueuelen", BLOBMSG_TYPE_INT32 },
+       [DEV_ATTR_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING },
+       [DEV_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_ARRAY },
+       [DEV_ATTR_MTU] = { .name = "mtu", .type = BLOBMSG_TYPE_INT32 },
+       [DEV_ATTR_MACADDR] = { .name = "macaddr", .type = BLOBMSG_TYPE_STRING },
+       [DEV_ATTR_TXQUEUELEN] = { .name = "txqueuelen", .type = BLOBMSG_TYPE_INT32 },
+       [DEV_ATTR_ENABLED] = { .name = "enabled", .type = BLOBMSG_TYPE_BOOL },
+       [DEV_ATTR_IPV6] = { .name = "ipv6", .type = BLOBMSG_TYPE_BOOL },
+       [DEV_ATTR_PROMISC] = { .name = "promisc", .type = BLOBMSG_TYPE_BOOL },
+       [DEV_ATTR_RPFILTER] = { .name = "rpfilter", .type = BLOBMSG_TYPE_STRING },
+       [DEV_ATTR_ACCEPTLOCAL] = { .name = "acceptlocal", .type = BLOBMSG_TYPE_BOOL },
+       [DEV_ATTR_IGMPVERSION] = { .name = "igmpversion", .type = BLOBMSG_TYPE_INT32 },
+       [DEV_ATTR_MLDVERSION] = { .name = "mldversion", .type = BLOBMSG_TYPE_INT32 },
 };
 
-const struct config_param_list device_attr_list = {
+const struct uci_blob_param_list device_attr_list = {
        .n_params = __DEV_ATTR_MAX,
        .params = dev_attrs,
 };
 
+static int __devlock = 0;
+
+void device_lock(void)
+{
+       __devlock++;
+}
+
+void device_unlock(void)
+{
+       __devlock--;
+       if (!__devlock)
+               device_free_unused(NULL);
+}
+
+static int set_device_state(struct device *dev, bool state)
+{
+       if (state) {
+               /* Set ifindex for all devices being enabled so a valid  */
+               /* ifindex is in place avoiding possible race conditions */
+               device_set_ifindex(dev, system_if_resolve(dev));
+               if (!dev->ifindex)
+                       return -1;
+       }
+
+       if (dev->external)
+               return 0;
+
+       if (state)
+               system_if_up(dev);
+       else
+               system_if_down(dev);
+
+       return 0;
+}
+
+static int
+simple_device_set_state(struct device *dev, bool state)
+{
+       struct device *pdev;
+       int ret = 0;
+
+       pdev = dev->parent.dev;
+       if (state && !pdev) {
+               pdev = system_if_get_parent(dev);
+               if (pdev)
+                       device_add_user(&dev->parent, pdev);
+       }
+
+       if (pdev) {
+               if (state)
+                       ret = device_claim(&dev->parent);
+               else
+                       device_release(&dev->parent);
+
+               if (ret < 0)
+                       return ret;
+       }
+       return set_device_state(dev, state);
+}
+
 static struct device *
-simple_device_create(struct blob_attr *attr)
+simple_device_create(const char *name, struct blob_attr *attr)
 {
        struct blob_attr *tb[__DEV_ATTR_MAX];
        struct device *dev = NULL;
-       const char *name;
 
        blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb, blob_data(attr), blob_len(attr));
-       if (!tb[DEV_ATTR_NAME])
-               return NULL;
-
-       name = blobmsg_data(tb[DEV_ATTR_NAME]);
-       if (!name)
-               return NULL;
-
        dev = device_get(name, true);
        if (!dev)
                return NULL;
 
+       dev->set_state = simple_device_set_state;
        device_init_settings(dev, tb);
 
        return dev;
@@ -57,7 +129,8 @@ simple_device_create(struct blob_attr *attr)
 
 static void simple_device_free(struct device *dev)
 {
-       device_cleanup(dev);
+       if (dev->parent.dev)
+               device_remove_user(&dev->parent);
        free(dev);
 }
 
@@ -70,31 +143,97 @@ const struct device_type simple_device_type = {
        .free = simple_device_free,
 };
 
+static void
+device_merge_settings(struct device *dev, struct device_settings *n)
+{
+       struct device_settings *os = &dev->orig_settings;
+       struct device_settings *s = &dev->settings;
+
+       memset(n, 0, sizeof(*n));
+       n->mtu = s->flags & DEV_OPT_MTU ? s->mtu : os->mtu;
+       n->txqueuelen = s->flags & DEV_OPT_TXQUEUELEN ?
+               s->txqueuelen : os->txqueuelen;
+       memcpy(n->macaddr,
+               (s->flags & DEV_OPT_MACADDR ? s->macaddr : os->macaddr),
+               sizeof(n->macaddr));
+       n->ipv6 = s->flags & DEV_OPT_IPV6 ? s->ipv6 : os->ipv6;
+       n->promisc = s->flags & DEV_OPT_PROMISC ? s->promisc : os->promisc;
+       n->rpfilter = s->flags & DEV_OPT_RPFILTER ? s->rpfilter : os->rpfilter;
+       n->acceptlocal = s->flags & DEV_OPT_ACCEPTLOCAL ? s->acceptlocal : os->acceptlocal;
+       n->igmpversion = s->flags & DEV_OPT_IGMPVERSION ? s->igmpversion : os->igmpversion;
+       n->mldversion = s->flags & DEV_OPT_MLDVERSION ? s->mldversion : os->mldversion;
+       n->flags = s->flags | os->flags;
+}
+
 void
 device_init_settings(struct device *dev, struct blob_attr **tb)
 {
+       struct device_settings *s = &dev->settings;
        struct blob_attr *cur;
        struct ether_addr *ea;
+       bool disabled = false;
 
-       dev->flags = 0;
+       s->flags = 0;
+       if ((cur = tb[DEV_ATTR_ENABLED]))
+               disabled = !blobmsg_get_bool(cur);
 
        if ((cur = tb[DEV_ATTR_MTU])) {
-               dev->mtu = blobmsg_get_u32(cur);
-               dev->flags |= DEV_OPT_MTU;
+               s->mtu = blobmsg_get_u32(cur);
+               s->flags |= DEV_OPT_MTU;
        }
 
        if ((cur = tb[DEV_ATTR_TXQUEUELEN])) {
-               dev->txqueuelen = blobmsg_get_u32(cur);
-               dev->flags |= DEV_OPT_TXQUEUELEN;
+               s->txqueuelen = blobmsg_get_u32(cur);
+               s->flags |= DEV_OPT_TXQUEUELEN;
        }
 
        if ((cur = tb[DEV_ATTR_MACADDR])) {
-               ea = ether_aton(blob_data(cur));
+               ea = ether_aton(blobmsg_data(cur));
                if (ea) {
-                       memcpy(dev->macaddr, ea, sizeof(dev->macaddr));
-                       dev->flags |= DEV_OPT_MACADDR;
+                       memcpy(s->macaddr, ea, 6);
+                       s->flags |= DEV_OPT_MACADDR;
                }
        }
+
+       if ((cur = tb[DEV_ATTR_IPV6])) {
+               s->ipv6 = blobmsg_get_bool(cur);
+               s->flags |= DEV_OPT_IPV6;
+       }
+
+       if ((cur = tb[DEV_ATTR_PROMISC])) {
+               s->promisc = blobmsg_get_bool(cur);
+               s->flags |= DEV_OPT_PROMISC;
+       }
+
+       if ((cur = tb[DEV_ATTR_RPFILTER])) {
+               if (system_resolve_rpfilter(blobmsg_data(cur), &s->rpfilter))
+                       s->flags |= DEV_OPT_RPFILTER;
+               else
+                       DPRINTF("Failed to resolve rpfilter: %s\n", (char *) blobmsg_data(cur));
+       }
+
+       if ((cur = tb[DEV_ATTR_ACCEPTLOCAL])) {
+               s->acceptlocal = blobmsg_get_bool(cur);
+               s->flags |= DEV_OPT_ACCEPTLOCAL;
+       }
+
+       if ((cur = tb[DEV_ATTR_IGMPVERSION])) {
+               s->igmpversion = blobmsg_get_u32(cur);
+               if (s->igmpversion >= 1 && s->igmpversion <= 3)
+                       s->flags |= DEV_OPT_IGMPVERSION;
+               else
+                       DPRINTF("Failed to resolve igmpversion: %d\n", blobmsg_get_u32(cur));
+       }
+
+       if ((cur = tb[DEV_ATTR_MLDVERSION])) {
+               s->mldversion = blobmsg_get_u32(cur);
+               if (s->mldversion >= 1 && s->mldversion <= 2)
+                       s->flags |= DEV_OPT_MLDVERSION;
+               else
+                       DPRINTF("Failed to resolve mldversion: %d\n", blobmsg_get_u32(cur));
+       }
+
+       device_set_disabled(dev, disabled);
 }
 
 static void __init dev_init(void)
@@ -102,26 +241,26 @@ static void __init dev_init(void)
        avl_init(&devices, avl_strcmp, true, NULL);
 }
 
-static void device_broadcast_event(struct device *dev, enum device_event ev)
+static int device_broadcast_cb(void *ctx, struct safe_list *list)
 {
-       struct device_user *dep, *tmp;
+       struct device_user *dep = container_of(list, struct device_user, list);
+       int *ev = ctx;
 
-       list_for_each_entry_safe(dep, tmp, &dev->users, list) {
-               if (!dep->cb)
-                       continue;
+       /* device might have been removed by an earlier callback */
+       if (!dep->dev)
+               return 0;
 
-               dep->cb(dep, ev);
-       }
+       if (dep->cb)
+               dep->cb(dep, *ev);
+       return 0;
 }
 
-static int set_device_state(struct device *dev, bool state)
+void device_broadcast_event(struct device *dev, enum device_event ev)
 {
-       if (state)
-               system_if_up(dev);
-       else
-               system_if_down(dev);
+       int dev_ev = ev;
 
-       return 0;
+       safe_list_for_each(&dev->aliases, device_broadcast_cb, &dev_ev);
+       safe_list_for_each(&dev->users, device_broadcast_cb, &dev_ev);
 }
 
 int device_claim(struct device_user *dep)
@@ -133,7 +272,7 @@ int device_claim(struct device_user *dep)
                return 0;
 
        dep->claimed = true;
-       D(DEVICE, "claim device %s, new refcount: %d\n", dev->ifname, dev->active + 1);
+       D(DEVICE, "Claim %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active + 1);
        if (++dev->active != 1)
                return 0;
 
@@ -141,8 +280,11 @@ int device_claim(struct device_user *dep)
        ret = dev->set_state(dev, true);
        if (ret == 0)
                device_broadcast_event(dev, DEV_EVENT_UP);
-       else
+       else {
+               D(DEVICE, "claim %s %s failed: %d\n", dev->type->name, dev->ifname, ret);
                dev->active = 0;
+               dep->claimed = false;
+       }
 
        return ret;
 }
@@ -156,21 +298,22 @@ void device_release(struct device_user *dep)
 
        dep->claimed = false;
        dev->active--;
-       D(DEVICE, "release device %s, new refcount: %d\n", dev->ifname, dev->active);
+       D(DEVICE, "Release %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active);
        assert(dev->active >= 0);
 
        if (dev->active)
                return;
 
        device_broadcast_event(dev, DEV_EVENT_TEARDOWN);
-       dev->set_state(dev, false);
+       if (!dev->external)
+               dev->set_state(dev, false);
        device_broadcast_event(dev, DEV_EVENT_DOWN);
 }
 
 int device_check_state(struct device *dev)
 {
        if (!dev->type->check_state)
-               return 0;
+               return simple_device_type.check_state(dev);
 
        return dev->type->check_state(dev);
 }
@@ -184,8 +327,12 @@ void device_init_virtual(struct device *dev, const struct device_type *type, con
                strncpy(dev->ifname, name, IFNAMSIZ);
 
        D(DEVICE, "Initialize device '%s'\n", dev->ifname);
-       INIT_LIST_HEAD(&dev->users);
+       INIT_SAFE_LIST(&dev->users);
+       INIT_SAFE_LIST(&dev->aliases);
        dev->type = type;
+
+       if (!dev->set_state)
+               dev->set_state = set_device_state;
 }
 
 int device_init(struct device *dev, const struct device_type *type, const char *ifname)
@@ -194,81 +341,203 @@ int device_init(struct device *dev, const struct device_type *type, const char *
 
        device_init_virtual(dev, type, ifname);
 
-       if (!dev->set_state)
-               dev->set_state = set_device_state;
-
        dev->avl.key = dev->ifname;
 
        ret = avl_insert(&devices, &dev->avl);
        if (ret < 0)
                return ret;
 
+       system_if_clear_state(dev);
        device_check_state(dev);
 
        return 0;
 }
 
-struct device *device_get(const char *name, bool create)
+static struct device *
+device_create_default(const char *name, bool external)
+{
+       struct device *dev;
+
+       if (!external && system_if_force_external(name))
+               return NULL;
+
+       D(DEVICE, "Create simple device '%s'\n", name);
+       dev = calloc(1, sizeof(*dev));
+       dev->external = external;
+       dev->set_state = simple_device_set_state;
+       device_init(dev, &simple_device_type, name);
+       dev->default_config = true;
+       return dev;
+}
+
+struct device *
+device_get(const char *name, int create)
 {
        struct device *dev;
 
        if (strchr(name, '.'))
                return get_vlan_device_chain(name, create);
 
+       if (name[0] == '@')
+               return device_alias_get(name + 1);
+
        dev = avl_find_element(&devices, name, dev, avl);
-       if (dev)
+       if (dev) {
+               if (create > 1 && !dev->external) {
+                       dev->external = true;
+                       device_set_present(dev, true);
+               }
                return dev;
+       }
 
        if (!create)
                return NULL;
 
-       dev = calloc(1, sizeof(*dev));
-       device_init(dev, &simple_device_type, name);
-
-       return dev;
+       return device_create_default(name, create > 1);
 }
 
-void device_cleanup(struct device *dev)
+static void
+device_delete(struct device *dev)
 {
-       struct device_user *dep, *tmp;
+       if (!dev->avl.key)
+               return;
 
-       D(DEVICE, "Clean up device '%s'\n", dev->ifname);
-       list_for_each_entry_safe(dep, tmp, &dev->users, list) {
-               if (!dep->cb)
-                       continue;
+       D(DEVICE, "Delete device '%s' from list\n", dev->ifname);
+       avl_delete(&devices, &dev->avl);
+       dev->avl.key = NULL;
+}
 
+static int device_cleanup_cb(void *ctx, struct safe_list *list)
+{
+       struct device_user *dep = container_of(list, struct device_user, list);
+       if (dep->cb)
                dep->cb(dep, DEV_EVENT_REMOVE);
-       }
 
-       if (dev->avl.key)
-               avl_delete(&devices, &dev->avl);
+       device_release(dep);
+       return 0;
 }
 
-void device_set_present(struct device *dev, bool state)
+void device_cleanup(struct device *dev)
+{
+       D(DEVICE, "Clean up device '%s'\n", dev->ifname);
+       safe_list_for_each(&dev->users, device_cleanup_cb, NULL);
+       safe_list_for_each(&dev->aliases, device_cleanup_cb, NULL);
+       device_delete(dev);
+}
+
+static void __device_set_present(struct device *dev, bool state)
 {
        if (dev->present == state)
                return;
 
-       D(DEVICE, "Device '%s' %s present\n", dev->ifname, state ? "is now" : "is no longer" );
        dev->present = state;
        device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
 }
 
+void
+device_refresh_present(struct device *dev)
+{
+       bool state = dev->sys_present;
+
+       if (dev->disabled || dev->deferred)
+               state = false;
+
+       __device_set_present(dev, state);
+}
+
+void device_set_present(struct device *dev, bool state)
+{
+       if (dev->sys_present == state)
+               return;
+
+       D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
+       dev->sys_present = state;
+       device_refresh_present(dev);
+}
+
+void device_set_link(struct device *dev, bool state)
+{
+       if (dev->link_active == state)
+               return;
+
+       netifd_log_message(L_NOTICE, "%s '%s' link is %s\n", dev->type->name, dev->ifname, state ? "up" : "down" );
+
+       dev->link_active = state;
+       device_broadcast_event(dev, state ? DEV_EVENT_LINK_UP : DEV_EVENT_LINK_DOWN);
+}
+
+void device_set_ifindex(struct device *dev, int ifindex)
+{
+       if (dev->ifindex == ifindex)
+               return;
+
+       dev->ifindex = ifindex;
+       device_broadcast_event(dev, DEV_EVENT_UPDATE_IFINDEX);
+}
+
+static int device_refcount(struct device *dev)
+{
+       struct list_head *list;
+       int count = 0;
+
+       list_for_each(list, &dev->users.list)
+               count++;
+
+       list_for_each(list, &dev->aliases.list)
+               count++;
+
+       return count;
+}
+
 void device_add_user(struct device_user *dep, struct device *dev)
 {
+       struct safe_list *head;
+
+       if (dep->dev == dev)
+               return;
+
+       if (dep->dev)
+               device_remove_user(dep);
+
+       if (!dev)
+               return;
+
        dep->dev = dev;
-       list_add_tail(&dep->list, &dev->users);
+
+       if (dep->alias)
+               head = &dev->aliases;
+       else
+               head = &dev->users;
+
+       safe_list_add(&dep->list, head);
+       D(DEVICE, "Add user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev));
+
        if (dep->cb && dev->present) {
                dep->cb(dep, DEV_EVENT_ADD);
                if (dev->active)
                        dep->cb(dep, DEV_EVENT_UP);
+
+               if (dev->link_active)
+                       dep->cb(dep, DEV_EVENT_LINK_UP);
        }
 }
 
+void
+device_free(struct device *dev)
+{
+       __devlock++;
+       free(dev->config);
+       device_cleanup(dev);
+       dev->type->free(dev);
+       __devlock--;
+}
+
 static void
 __device_free_unused(struct device *dev)
 {
-       if (!list_empty(&dev->users))
+       if (!safe_list_empty(&dev->users) ||
+               !safe_list_empty(&dev->aliases) ||
+           dev->current_config || __devlock)
                return;
 
        device_free(dev);
@@ -278,11 +547,16 @@ void device_remove_user(struct device_user *dep)
 {
        struct device *dev = dep->dev;
 
+       if (!dep->dev)
+               return;
+
+       dep->hotplug = false;
        if (dep->claimed)
                device_release(dep);
 
-       list_del(&dep->list);
+       safe_list_del(&dep->list);
        dep->dev = NULL;
+       D(DEVICE, "Remove user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev));
        __device_free_unused(dev);
 }
 
@@ -298,29 +572,49 @@ device_free_unused(struct device *dev)
                __device_free_unused(dev);
 }
 
-enum dev_change_type
-device_reload_config(struct device *dev, struct blob_attr *attr)
+void
+device_init_pending(void)
 {
-       struct blob_attr *tb[__DEV_ATTR_MAX], *tb1[__DEV_ATTR_MAX];
+       struct device *dev, *tmp;
 
-       blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb,
-               blob_data(attr), blob_len(attr));
-       if (dev->config)
-               blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb1,
-                       blob_data(dev->config), blob_len(dev->config));
-       else
-               memset(tb1, 0, sizeof(tb1));
+       avl_for_each_element_safe(&devices, dev, avl, tmp) {
+               if (!dev->config_pending)
+                       continue;
+
+               dev->type->config_init(dev);
+               dev->config_pending = false;
+       }
+}
 
-       if (!config_diff(tb, tb1, &device_attr_list, NULL))
+static enum dev_change_type
+device_reload_config(struct device *dev, struct blob_attr *attr)
+{
+       struct blob_attr *tb[__DEV_ATTR_MAX];
+       const struct uci_blob_param_list *cfg = dev->type->config_params;
+
+       if (uci_blob_check_equal(dev->config, attr, cfg))
                return DEV_CONFIG_NO_CHANGE;
 
-       device_init_settings(dev, tb);
-       return DEV_CONFIG_APPLIED;
+       if (cfg == &device_attr_list) {
+               memset(tb, 0, sizeof(tb));
+
+               if (attr)
+                       blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb,
+                               blob_data(attr), blob_len(attr));
+
+               device_init_settings(dev, tb);
+               return DEV_CONFIG_RESTART;
+       } else
+               return DEV_CONFIG_RECREATE;
 }
 
-static enum dev_change_type
-device_check_config(struct device *dev, struct blob_attr *attr)
+enum dev_change_type
+device_set_config(struct device *dev, const struct device_type *type,
+                 struct blob_attr *attr)
 {
+       if (type != dev->type)
+               return DEV_CONFIG_RECREATE;
+
        if (dev->type->reload)
                return dev->type->reload(dev, attr);
 
@@ -336,9 +630,11 @@ device_replace(struct device *dev, struct device *odev)
        if (present)
                device_set_present(odev, false);
 
-       list_for_each_entry_safe(dep, tmp, &odev->users, list) {
-               device_remove_user(dep);
-               device_add_user(dep, dev);
+       list_for_each_entry_safe(dep, tmp, &odev->users.list, list.list) {
+               device_release(dep);
+               safe_list_del(&dep->list);
+               safe_list_add(&dep->list, &dev->users);
+               dep->dev = dev;
        }
        device_free(odev);
 
@@ -346,6 +642,32 @@ device_replace(struct device *dev, struct device *odev)
                device_set_present(dev, true);
 }
 
+void
+device_reset_config(void)
+{
+       struct device *dev;
+
+       avl_for_each_element(&devices, dev, avl)
+               dev->current_config = false;
+}
+
+void
+device_reset_old(void)
+{
+       struct device *dev, *tmp, *ndev;
+
+       avl_for_each_element_safe(&devices, dev, avl, tmp) {
+               if (dev->current_config || dev->default_config)
+                       continue;
+
+               if (dev->type != &simple_device_type)
+                       continue;
+
+               ndev = device_create_default(dev->ifname, dev->external);
+               device_replace(ndev, dev);
+       }
+}
+
 struct device *
 device_create(const char *name, const struct device_type *type,
              struct blob_attr *config)
@@ -353,35 +675,115 @@ device_create(const char *name, const struct device_type *type,
        struct device *odev = NULL, *dev;
        enum dev_change_type change;
 
-       D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
-       config = config_memdup(config);
+       config = blob_memdup(config);
        if (!config)
                return NULL;
 
        odev = device_get(name, false);
        if (odev) {
-               change = device_check_config(odev, config);
+               odev->current_config = true;
+               change = device_set_config(odev, type, config);
+               if (odev->external) {
+                       system_if_apply_settings(odev, &odev->settings, odev->settings.flags);
+                       change = DEV_CONFIG_APPLIED;
+               }
                switch (change) {
+               case DEV_CONFIG_RESTART:
                case DEV_CONFIG_APPLIED:
+                       D(DEVICE, "Device '%s': config applied\n", odev->ifname);
                        free(odev->config);
                        odev->config = config;
-                       if (odev->present) {
+                       if (change == DEV_CONFIG_RESTART && odev->present) {
                                device_set_present(odev, false);
                                device_set_present(odev, true);
                        }
-                       /* fall through */
+                       return odev;
                case DEV_CONFIG_NO_CHANGE:
+                       D(DEVICE, "Device '%s': no configuration change\n", odev->ifname);
                        free(config);
                        return odev;
                case DEV_CONFIG_RECREATE:
+                       D(DEVICE, "Device '%s': recreate device\n", odev->ifname);
+                       device_delete(odev);
                        break;
                }
-       }
+       } else
+               D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
+
+       dev = type->create(name, config);
+       if (!dev)
+               return NULL;
 
-       dev = type->create(config);
+       dev->current_config = true;
        dev->config = config;
        if (odev)
                device_replace(dev, odev);
 
+       if (!config_init && dev->config_pending)
+               type->config_init(dev);
+
        return dev;
 }
+
+void
+device_dump_status(struct blob_buf *b, struct device *dev)
+{
+       struct device_settings st;
+       void *c, *s;
+
+       if (!dev) {
+               avl_for_each_element(&devices, dev, avl) {
+                       if (!dev->present)
+                               continue;
+                       c = blobmsg_open_table(b, dev->ifname);
+                       device_dump_status(b, dev);
+                       blobmsg_close_table(b, c);
+               }
+
+               return;
+       }
+
+       blobmsg_add_u8(b, "external", dev->external);
+       blobmsg_add_u8(b, "present", dev->present);
+       blobmsg_add_string(b, "type", dev->type->name);
+
+       if (!dev->present)
+               return;
+
+       blobmsg_add_u8(b, "up", !!dev->active);
+       blobmsg_add_u8(b, "carrier", !!dev->link_active);
+
+       if (dev->type->dump_info)
+               dev->type->dump_info(dev, b);
+       else
+               system_if_dump_info(dev, b);
+
+       if (dev->active) {
+               device_merge_settings(dev, &st);
+               if (st.flags & DEV_OPT_MTU)
+                       blobmsg_add_u32(b, "mtu", st.mtu);
+               if (st.flags & DEV_OPT_MACADDR)
+                       blobmsg_add_string(b, "macaddr", format_macaddr(st.macaddr));
+               if (st.flags & DEV_OPT_TXQUEUELEN)
+                       blobmsg_add_u32(b, "txqueuelen", st.txqueuelen);
+               if (st.flags & DEV_OPT_IPV6)
+                       blobmsg_add_u8(b, "ipv6", st.ipv6);
+               if (st.flags & DEV_OPT_PROMISC)
+                       blobmsg_add_u8(b, "promisc", st.promisc);
+               if (st.flags & DEV_OPT_RPFILTER)
+                       blobmsg_add_u32(b, "rpfilter", st.rpfilter);
+               if (st.flags & DEV_OPT_ACCEPTLOCAL)
+                       blobmsg_add_u8(b, "acceptlocal", st.acceptlocal);
+               if (st.flags & DEV_OPT_IGMPVERSION)
+                       blobmsg_add_u32(b, "igmpversion", st.igmpversion);
+               if (st.flags & DEV_OPT_MLDVERSION)
+                       blobmsg_add_u32(b, "mldversion", st.mldversion);
+       }
+
+       s = blobmsg_open_table(b, "statistics");
+       if (dev->type->dump_stats)
+               dev->type->dump_stats(dev, b);
+       else
+               system_if_dump_stats(dev, b);
+       blobmsg_close_table(b, s);
+}