X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=9344e1bd89abd7ab316ccc8ac8bac7c6fe5b9441;hp=59a57f403803e11be4bda2268b11099ebee6ec1f;hb=3610a24b218974bdf2d2f709a8af9e4a990c47bd;hpb=9f3e8eae623da44eea2453bf2e63d5f1cba9e923 diff --git a/device.c b/device.c index 59a57f4..9344e1b 100644 --- a/device.c +++ b/device.c @@ -48,6 +48,9 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = { [DEV_ATTR_RPS] = { .name = "rps", .type = BLOBMSG_TYPE_BOOL }, [DEV_ATTR_XPS] = { .name = "xps", .type = BLOBMSG_TYPE_BOOL }, [DEV_ATTR_DADTRANSMITS] = { .name = "dadtransmits", .type = BLOBMSG_TYPE_INT32 }, + [DEV_ATTR_MULTICAST_TO_UNICAST] = { .name = "multicast_to_unicast", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_MULTICAST_ROUTER] = { .name = "multicast_router", .type = BLOBMSG_TYPE_INT32 }, + [DEV_ATTR_MULTICAST] = { .name ="multicast", .type = BLOBMSG_TYPE_BOOL }, }; const struct uci_blob_param_list device_attr_list = { @@ -72,18 +75,14 @@ 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 */ + /* Get 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); @@ -174,7 +173,11 @@ device_merge_settings(struct device *dev, struct device_settings *n) s->neigh6reachabletime : os->neigh6reachabletime; n->dadtransmits = s->flags & DEV_OPT_DADTRANSMITS ? s->dadtransmits : os->dadtransmits; - n->flags = s->flags | os->flags; + n->multicast = s->flags & DEV_OPT_MULTICAST ? + s->multicast : os->multicast; + n->multicast_to_unicast = s->multicast_to_unicast; + n->multicast_router = s->multicast_router; + n->flags = s->flags | os->flags | os->valid_flags; } void @@ -274,6 +277,24 @@ device_init_settings(struct device *dev, struct blob_attr **tb) s->flags |= DEV_OPT_DADTRANSMITS; } + if ((cur = tb[DEV_ATTR_MULTICAST_TO_UNICAST])) { + s->multicast_to_unicast = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_MULTICAST_TO_UNICAST; + } + + if ((cur = tb[DEV_ATTR_MULTICAST_ROUTER])) { + s->multicast_router = blobmsg_get_u32(cur); + if (s->multicast_router <= 2) + s->flags |= DEV_OPT_MULTICAST_ROUTER; + else + DPRINTF("Invalid value: %d - (Use 0: never, 1: learn, 2: always)\n", blobmsg_get_u32(cur)); + } + + if ((cur = tb[DEV_ATTR_MULTICAST])) { + s->multicast = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_MULTICAST; + } + device_set_disabled(dev, disabled); } @@ -307,18 +328,31 @@ void device_broadcast_event(struct device *dev, enum device_event ev) int device_claim(struct device_user *dep) { struct device *dev = dep->dev; - int ret; + int ret = 0; if (dep->claimed) return 0; + if (!dev) + return -1; + dep->claimed = true; D(DEVICE, "Claim %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active + 1); if (++dev->active != 1) return 0; device_broadcast_event(dev, DEV_EVENT_SETUP); - ret = dev->set_state(dev, true); + if (dev->external) { + /* Get ifindex for external claimed devices so a valid */ + /* ifindex is in place avoiding possible race conditions */ + device_set_ifindex(dev, system_if_resolve(dev)); + if (!dev->ifindex) + ret = -1; + + system_if_get_settings(dev, &dev->orig_settings); + } else + ret = dev->set_state(dev, true); + if (ret == 0) device_broadcast_event(dev, DEV_EVENT_UP); else { @@ -406,6 +440,9 @@ device_create_default(const char *name, bool external) D(DEVICE, "Create simple device '%s'\n", name); dev = calloc(1, sizeof(*dev)); + if (!dev) + return NULL; + dev->external = external; dev->set_state = simple_device_set_state; device_init(dev, &simple_device_type, name); @@ -429,6 +466,7 @@ device_get(const char *name, int create) dev = avl_find_element(&devices, name, dev, avl); if (dev) { if (create > 1 && !dev->external) { + system_if_apply_settings(dev, &dev->settings, dev->settings.flags); dev->external = true; device_set_present(dev, true); } @@ -534,19 +572,11 @@ static int device_refcount(struct device *dev) return count; } -void device_add_user(struct device_user *dep, struct device *dev) +static 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; if (dep->alias) @@ -567,6 +597,20 @@ void device_add_user(struct device_user *dep, struct device *dev) } } +void device_add_user(struct device_user *dep, struct device *dev) +{ + if (dep->dev == dev) + return; + + if (dep->dev) + device_remove_user(dep); + + if (!dev) + return; + + __device_add_user(dep, dev); +} + void device_free(struct device *dev) { @@ -680,12 +724,16 @@ device_apply_config(struct device *dev, const struct device_type *type, free(dev->config); dev->config = config; if (change == DEV_CONFIG_RESTART && dev->present) { + int ret = 0; + device_set_present(dev, false); if (dev->active && !dev->external) { - dev->set_state(dev, false); - dev->set_state(dev, true); + ret = dev->set_state(dev, false); + if (!ret) + ret = dev->set_state(dev, true); } - device_set_present(dev, true); + if (!ret) + device_set_present(dev, true); } break; case DEV_CONFIG_NO_CHANGE: @@ -702,24 +750,19 @@ static void device_replace(struct device *dev, struct device *odev) { struct device_user *dep, *tmp; - bool present = odev->present; __devlock++; - if (present) + if (odev->present) device_set_present(odev, false); 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_add_user(dep, dev); } __devlock--; device_free(odev); - - if (present) - device_set_present(dev, true); } void @@ -890,6 +933,12 @@ device_dump_status(struct blob_buf *b, struct device *dev) } if (st.flags & DEV_OPT_DADTRANSMITS) blobmsg_add_u32(b, "dadtransmits", st.dadtransmits); + if (st.flags & DEV_OPT_MULTICAST_TO_UNICAST) + blobmsg_add_u8(b, "multicast_to_unicast", st.multicast_to_unicast); + if (st.flags & DEV_OPT_MULTICAST_ROUTER) + blobmsg_add_u32(b, "multicast_router", st.multicast_router); + if (st.flags & DEV_OPT_MULTICAST) + blobmsg_add_u8(b, "multicast", st.multicast); } s = blobmsg_open_table(b, "statistics");