static struct avl_tree devices;
static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
- [DEV_ATTR_TYPE] = { "type", 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_ENABLED] = { "enabled", BLOBMSG_TYPE_BOOL },
+ [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 },
};
-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,
};
struct device_user *dep = container_of(list, struct device_user, list);
int *ev = ctx;
+ /* device might have been removed by an earlier callback */
+ if (!dep->dev)
+ return 0;
+
if (dep->cb)
dep->cb(dep, *ev);
return 0;
return 0;
dep->claimed = true;
- D(DEVICE, "Claim %s %s, new refcount: %d\n", dev->type->name, 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;
if (ret == 0)
device_broadcast_event(dev, DEV_EVENT_UP);
else {
- D(DEVICE, "claim device %s failed: %d\n", dev->ifname, ret);
+ D(DEVICE, "claim %s %s failed: %d\n", dev->type->name, dev->ifname, ret);
dev->active = 0;
dep->claimed = false;
}
dep->claimed = false;
dev->active--;
- D(DEVICE, "Release %s %s, new refcount: %d\n", dev->type->name, 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)
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;
{
struct safe_list *head;
+ if (dep->dev == dev)
+ return;
+
if (dep->dev)
device_remove_user(dep);
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);
}
}
device_reload_config(struct device *dev, struct blob_attr *attr)
{
struct blob_attr *tb[__DEV_ATTR_MAX];
- const struct config_param_list *cfg = dev->type->config_params;
+ const struct uci_blob_param_list *cfg = dev->type->config_params;
- if (config_check_equal(dev->config, attr, cfg))
+ if (uci_blob_check_equal(dev->config, attr, cfg))
return DEV_CONFIG_NO_CHANGE;
if (cfg == &device_attr_list) {
struct device *odev = NULL, *dev;
enum dev_change_type change;
- config = config_memdup(config);
+ config = blob_memdup(config);
if (!config)
return NULL;
odev->current_config = true;
change = device_set_config(odev, type, config);
if (odev->external) {
- system_if_apply_settings(odev, &odev->settings);
+ system_if_apply_settings(odev, &odev->settings, odev->settings.flags);
change = DEV_CONFIG_APPLIED;
}
switch (change) {
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