X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=54638e7c25fb7e1bb85886ebbb8ff4886c0bb368;hp=80881d29edd4a47e1c90bfff4da363586538de14;hb=258b79f7a912abc84a3066c90266d8835597362e;hpb=51b3f21fef7f581a7df6d8a73d8b973f9eb355d2 diff --git a/device.c b/device.c index 80881d2..54638e7 100644 --- a/device.c +++ b/device.c @@ -31,15 +31,21 @@ 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 }, + [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, }; @@ -60,6 +66,17 @@ void device_unlock(void) 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 @@ -139,6 +156,12 @@ device_merge_settings(struct device *dev, struct device_settings *n) 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; } @@ -172,6 +195,44 @@ device_init_settings(struct device *dev, struct blob_attr **tb) } } + 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); } @@ -180,23 +241,26 @@ static void __init dev_init(void) avl_init(&devices, avl_strcmp, true, NULL); } - -static void __device_broadcast_event(struct list_head *head, 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, head, 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) { - __device_broadcast_event(&dev->aliases, ev); - __device_broadcast_event(&dev->users, 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) @@ -208,7 +272,7 @@ 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; @@ -217,7 +281,7 @@ int device_claim(struct device_user *dep) 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; } @@ -234,14 +298,14 @@ void device_release(struct device_user *dep) 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) return; device_broadcast_event(dev, DEV_EVENT_TEARDOWN); - if (!dep->hotplug) + if (!dev->external) dev->set_state(dev, false); device_broadcast_event(dev, DEV_EVENT_DOWN); } @@ -249,7 +313,7 @@ void device_release(struct device_user *dep) 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); } @@ -263,8 +327,8 @@ 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_LIST_HEAD(&dev->aliases); + INIT_SAFE_LIST(&dev->users); + INIT_SAFE_LIST(&dev->aliases); dev->type = type; if (!dev->set_state) @@ -318,8 +382,13 @@ device_get(const char *name, int create) 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; @@ -338,19 +407,21 @@ device_delete(struct device *dev) 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); } @@ -384,9 +455,46 @@ void device_set_present(struct device *dev, bool 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 list_head *head; + struct safe_list *head; + + if (dep->dev == dev) + return; if (dep->dev) device_remove_user(dep); @@ -400,12 +508,17 @@ void device_add_user(struct device_user *dep, struct device *dev) head = &dev->aliases; else head = &dev->users; - list_add_tail(&dep->list, head); + + 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); } } @@ -422,7 +535,9 @@ device_free(struct device *dev) 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); @@ -439,8 +554,9 @@ void device_remove_user(struct device_user *dep) 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); } @@ -470,13 +586,20 @@ device_init_pending(void) } } -static enum dev_change_type -device_reload_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) { struct blob_attr *tb[__DEV_ATTR_MAX]; - const struct config_param_list *cfg = dev->type->config_params; + const struct uci_blob_param_list *cfg = type->config_params; + + if (type != dev->type) + return DEV_CONFIG_RECREATE; + + if (dev->type->reload) + return dev->type->reload(dev, attr); - 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) { @@ -493,16 +616,41 @@ device_reload_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) +device_apply_config(struct device *dev, const struct device_type *type, + struct blob_attr *config) { - if (type != dev->type) - return DEV_CONFIG_RECREATE; + enum dev_change_type change; - if (dev->type->reload) - return dev->type->reload(dev, attr); + change = device_set_config(dev, type, config); + if (dev->external) { + system_if_apply_settings(dev, &dev->settings, dev->settings.flags); + change = DEV_CONFIG_APPLIED; + } - return device_reload_config(dev, attr); + switch (change) { + case DEV_CONFIG_RESTART: + case DEV_CONFIG_APPLIED: + D(DEVICE, "Device '%s': config applied\n", dev->ifname); + config = blob_memdup(config); + free(dev->config); + dev->config = config; + if (change == DEV_CONFIG_RESTART && dev->present) { + device_set_present(dev, false); + if (dev->active && !dev->external) { + dev->set_state(dev, false); + dev->set_state(dev, true); + } + device_set_present(dev, true); + } + break; + case DEV_CONFIG_NO_CHANGE: + D(DEVICE, "Device '%s': no configuration change\n", dev->ifname); + break; + case DEV_CONFIG_RECREATE: + break; + } + + return change; } static void @@ -514,9 +662,10 @@ 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) { + 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); @@ -558,37 +707,25 @@ device_create(const char *name, const struct device_type *type, struct device *odev = NULL, *dev; enum dev_change_type change; - config = config_memdup(config); - if (!config) - return NULL; - odev = device_get(name, false); if (odev) { odev->current_config = true; - change = device_set_config(odev, type, config); + change = device_apply_config(odev, type, config); 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 (change == DEV_CONFIG_RESTART && odev->present) { - device_set_present(odev, false); - device_set_present(odev, true); - } - 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; + default: + return odev; } } else D(DEVICE, "Create new device '%s' (%s)\n", name, type->name); + config = blob_memdup(config); + if (!config) + return NULL; + dev = type->create(name, config); if (!dev) return NULL; @@ -630,6 +767,8 @@ device_dump_status(struct blob_buf *b, struct device *dev) 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 @@ -640,9 +779,21 @@ device_dump_status(struct blob_buf *b, struct device *dev) 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); + 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");