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 },
};
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;
ret = dev->set_state(dev, true);
if (ret == 0)
device_broadcast_event(dev, DEV_EVENT_UP);
- else
+ else {
+ D(DEVICE, "claim device %s failed: %d\n", dev->ifname, ret);
dev->active = 0;
+ dep->claimed = false;
+ }
return ret;
}
if (ret < 0)
return ret;
+ system_if_clear_state(dev);
device_check_state(dev);
return 0;
continue;
dep->cb(dep, DEV_EVENT_REMOVE);
+ device_release(dep);
}
device_delete(dev);
static void
__device_free_unused(struct device *dev)
{
- if (!list_empty(&dev->users) || dev->current_config)
+ if (!list_empty(&dev->users) || dev->current_config || config_init)
return;
device_free(dev);
enum dev_change_type
device_reload_config(struct device *dev, struct blob_attr *attr)
{
- struct blob_attr *tb[__DEV_ATTR_MAX], *tb1[__DEV_ATTR_MAX];
- const struct config_param_list *params = dev->type->config_params;
-
- 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));
+ struct blob_attr *tb[__DEV_ATTR_MAX];
+ const struct config_param_list *cfg = dev->type->config_params;
- if (!config_diff(tb, tb1, dev->type->config_params, NULL))
+ if (config_check_equal(dev->config, attr, cfg))
return DEV_CONFIG_NO_CHANGE;
- device_init_settings(dev, tb);
- if (params == &device_attr_list)
+ if (cfg == &device_attr_list) {
+ memset(tb, 0, sizeof(tb));
+
+ if (dev->config)
+ blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb,
+ blob_data(attr), blob_len(attr));
+
+ device_init_settings(dev, tb);
return DEV_CONFIG_APPLIED;
- else
+ } else
return DEV_CONFIG_RECREATE;
}
device_set_present(odev, false);
list_for_each_entry_safe(dep, tmp, &odev->users, list) {
- device_remove_user(dep);
- device_add_user(dep, dev);
+ device_release(dep);
+ list_move_tail(&dep->list, &dev->users);
+ dep->dev = dev;
}
device_free(odev);
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);
if (!config)
return NULL;
device_delete(odev);
break;
}
- }
+ } else
+ D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
- dev = type->create(config);
+ dev = type->create(name, config);
if (!dev)
return NULL;
return dev;
}
+
+void
+device_dump_status(struct blob_buf *b, struct device *dev)
+{
+ 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;
+ }
+
+ if (!dev->present)
+ return;
+
+ blobmsg_add_string(b, "type", dev->type->name);
+ blobmsg_add_u8(b, "up", !!dev->active);
+ if (dev->type->dump_info)
+ dev->type->dump_info(dev, b);
+
+ 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);
+}