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,
};
avl_init(&devices, avl_strcmp, true, NULL);
}
-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;
+}
+
+void device_broadcast_event(struct device *dev, enum device_event ev)
+{
+ int dev_ev = ev;
+
+ 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)
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)
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)
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->avl.key = NULL;
}
-void device_cleanup(struct device *dev)
+static int device_cleanup_cb(void *ctx, struct safe_list *list)
{
- struct device_user *dep, *tmp;
-
- D(DEVICE, "Clean up device '%s'\n", dev->ifname);
- list_for_each_entry_safe(dep, tmp, &dev->users, list) {
- if (!dep->cb)
- continue;
-
+ struct device_user *dep = container_of(list, struct device_user, list);
+ if (dep->cb)
dep->cb(dep, DEV_EVENT_REMOVE);
- device_release(dep);
- }
+ device_release(dep);
+ return 0;
+}
+
+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);
}
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);
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);
}
}
static void
__device_free_unused(struct device *dev)
{
- if (!list_empty(&dev->users) || dev->current_config || __devlock)
+ if (!safe_list_empty(&dev->users) ||
+ !safe_list_empty(&dev->aliases) ||
+ dev->current_config || __devlock)
return;
device_free(dev);
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);
}
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) {
if (present)
device_set_present(odev, false);
- list_for_each_entry_safe(dep, tmp, &odev->users, list) {
+ list_for_each_entry_safe(dep, tmp, &odev->users.list, list.list) {
device_release(dep);
- list_move_tail(&dep->list, &dev->users);
+ safe_list_del(&dep->list);
+ safe_list_add(&dep->list, &dev->users);
dep->dev = dev;
}
device_free(odev);
struct device *odev = NULL, *dev;
enum dev_change_type change;
- config = config_memdup(config);
+ config = blob_memdup(config);
if (!config)
return NULL;
if (odev) {
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:
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
if (st.flags & DEV_OPT_MTU)
blobmsg_add_u32(b, "mtu", st.mtu);
if (st.flags & DEV_OPT_MACADDR)
- blobmsg_add_string(b, "macaddr", ether_ntoa((struct ether_addr *) st.macaddr));
+ blobmsg_add_string(b, "macaddr", format_macaddr(st.macaddr));
if (st.flags & DEV_OPT_TXQUEUELEN)
blobmsg_add_u32(b, "txqueuelen", st.txqueuelen);
}