X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=3404feef93da5df07c8a5e2a73a23197ee40daaf;hp=f50fb8505e1b7653659d63ffb895cbf3f2421b98;hb=abbea9ebe8a8b56032e0f85b8572f0671dc094e5;hpb=b9d1f678c1f705b5635de31d333353a64ff6799d diff --git a/device.c b/device.c index f50fb85..3404fee 100644 --- a/device.c +++ b/device.c @@ -29,11 +29,12 @@ #include "config.h" static struct avl_tree devices; +static bool default_ps = true; static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = { [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_MTU6] = { .name = "mtu6", .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 }, @@ -43,6 +44,13 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = { [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 }, + [DEV_ATTR_NEIGHREACHABLETIME] = { .name = "neighreachabletime", .type = BLOBMSG_TYPE_INT32 }, + [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 = { @@ -67,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); @@ -151,6 +155,7 @@ device_merge_settings(struct device *dev, struct device_settings *n) memset(n, 0, sizeof(*n)); n->mtu = s->flags & DEV_OPT_MTU ? s->mtu : os->mtu; + n->mtu6 = s->flags & DEV_OPT_MTU6 ? s->mtu6 : os->mtu6; n->txqueuelen = s->flags & DEV_OPT_TXQUEUELEN ? s->txqueuelen : os->txqueuelen; memcpy(n->macaddr, @@ -162,7 +167,17 @@ device_merge_settings(struct device *dev, struct device_settings *n) 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; + n->neigh4reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ? + s->neigh4reachabletime : os->neigh4reachabletime; + n->neigh6reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ? + s->neigh6reachabletime : os->neigh6reachabletime; + n->dadtransmits = s->flags & DEV_OPT_DADTRANSMITS ? + s->dadtransmits : os->dadtransmits; + 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 @@ -182,6 +197,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb) s->flags |= DEV_OPT_MTU; } + if ((cur = tb[DEV_ATTR_MTU6])) { + s->mtu6 = blobmsg_get_u32(cur); + s->flags |= DEV_OPT_MTU6; + } + if ((cur = tb[DEV_ATTR_TXQUEUELEN])) { s->txqueuelen = blobmsg_get_u32(cur); s->flags |= DEV_OPT_TXQUEUELEN; @@ -233,6 +253,48 @@ device_init_settings(struct device *dev, struct blob_attr **tb) DPRINTF("Failed to resolve mldversion: %d\n", blobmsg_get_u32(cur)); } + if ((cur = tb[DEV_ATTR_NEIGHREACHABLETIME])) { + s->neigh6reachabletime = s->neigh4reachabletime = blobmsg_get_u32(cur); + s->flags |= DEV_OPT_NEIGHREACHABLETIME; + } + + if ((cur = tb[DEV_ATTR_RPS])) { + s->rps = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_RPS; + } + else + s->rps = default_ps; + + if ((cur = tb[DEV_ATTR_XPS])) { + s->xps = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_XPS; + } + else + s->xps = default_ps; + + if ((cur = tb[DEV_ATTR_DADTRANSMITS])) { + s->dadtransmits = blobmsg_get_u32(cur); + 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); } @@ -266,7 +328,7 @@ 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; @@ -277,7 +339,17 @@ int device_claim(struct device_user *dep) 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 { @@ -349,6 +421,8 @@ int device_init(struct device *dev, const struct device_type *type, const char * system_if_clear_state(dev); device_check_state(dev); + dev->settings.rps = default_ps; + dev->settings.xps = default_ps; return 0; } @@ -363,10 +437,15 @@ 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); dev->default_config = true; + if (external) + system_if_apply_settings(dev, &dev->settings, dev->settings.flags); return dev; } @@ -384,6 +463,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); } @@ -489,19 +569,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) @@ -522,6 +594,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) { @@ -586,7 +672,7 @@ device_init_pending(void) } } -enum dev_change_type +static enum dev_change_type device_set_config(struct device *dev, const struct device_type *type, struct blob_attr *attr) { @@ -631,16 +717,20 @@ device_apply_config(struct device *dev, const struct device_type *type, 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); - free(config); break; case DEV_CONFIG_RECREATE: break; @@ -653,21 +743,19 @@ static void device_replace(struct device *dev, struct device *odev) { struct device_user *dep, *tmp; - bool present = odev->present; - if (present) + __devlock++; + 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); } - device_free(odev); + __devlock--; - if (present) - device_set_present(dev, true); + device_free(odev); } void @@ -692,10 +780,48 @@ device_reset_old(void) continue; ndev = device_create_default(dev->ifname, dev->external); + if (!ndev) + continue; + device_replace(ndev, dev); } } +void +device_set_default_ps(bool state) +{ + struct device *dev; + + if (state == default_ps) + return; + + default_ps = state; + + avl_for_each_element(&devices, dev, avl) { + struct device_settings *s = &dev->settings; + unsigned int apply_mask = 0; + + if (!(s->flags & DEV_OPT_RPS)) { + s->rps = default_ps; + apply_mask |= DEV_OPT_RPS; + } + + if (!(s->flags & DEV_OPT_XPS)) { + s->xps = default_ps; + apply_mask |= DEV_OPT_XPS; + } + + if (!apply_mask) + continue; + + if (!(dev->external || (dev->present && dev->active)) || + dev->config_pending) + continue; + + system_if_apply_settings(dev, s, apply_mask); + } +} + struct device * device_create(const char *name, const struct device_type *type, struct blob_attr *config) @@ -703,10 +829,6 @@ device_create(const char *name, const struct device_type *type, struct device *odev = NULL, *dev; enum dev_change_type change; - config = blob_memdup(config); - if (!config) - return NULL; - odev = device_get(name, false); if (odev) { odev->current_config = true; @@ -722,6 +844,10 @@ device_create(const char *name, const struct device_type *type, } 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; @@ -731,8 +857,10 @@ device_create(const char *name, const struct device_type *type, if (odev) device_replace(dev, odev); - if (!config_init && dev->config_pending) + if (!config_init && dev->config_pending) { type->config_init(dev); + dev->config_pending = false; + } return dev; } @@ -774,6 +902,8 @@ device_dump_status(struct blob_buf *b, struct device *dev) device_merge_settings(dev, &st); if (st.flags & DEV_OPT_MTU) blobmsg_add_u32(b, "mtu", st.mtu); + if (st.flags & DEV_OPT_MTU6) + blobmsg_add_u32(b, "mtu6", st.mtu6); if (st.flags & DEV_OPT_MACADDR) blobmsg_add_string(b, "macaddr", format_macaddr(st.macaddr)); if (st.flags & DEV_OPT_TXQUEUELEN) @@ -790,6 +920,18 @@ device_dump_status(struct blob_buf *b, struct device *dev) blobmsg_add_u32(b, "igmpversion", st.igmpversion); if (st.flags & DEV_OPT_MLDVERSION) blobmsg_add_u32(b, "mldversion", st.mldversion); + if (st.flags & DEV_OPT_NEIGHREACHABLETIME) { + blobmsg_add_u32(b, "neigh4reachabletime", st.neigh4reachabletime); + blobmsg_add_u32(b, "neigh6reachabletime", st.neigh6reachabletime); + } + 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");