X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=1636611b3f9dc47d98b024094ddc7089550b4904;hp=d261e2536429da30a6a496b138813156effd0b34;hb=0b32f960b8b073fdf983430723d675a31a110784;hpb=f6f065d3997ccc8d42805529e4aad59b789579ad diff --git a/device.c b/device.c index d261e25..1636611 100644 --- a/device.c +++ b/device.c @@ -29,17 +29,25 @@ #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 }, [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 }, + [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 }, }; const struct uci_blob_param_list device_attr_list = { @@ -148,6 +156,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, @@ -156,6 +165,15 @@ device_merge_settings(struct device *dev, struct device_settings *n) 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->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->flags = s->flags | os->flags; } @@ -176,6 +194,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; @@ -206,6 +229,51 @@ device_init_settings(struct device *dev, struct blob_attr **tb) 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)); + } + + 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; + } + device_set_disabled(dev, disabled); } @@ -322,6 +390,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; } @@ -340,6 +410,8 @@ device_create_default(const char *name, bool 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; } @@ -560,10 +632,17 @@ device_init_pending(void) } static enum dev_change_type -device_reload_config(struct device *dev, struct blob_attr *attr) +device_set_config(struct device *dev, const struct device_type *type, + struct blob_attr *attr) { struct blob_attr *tb[__DEV_ATTR_MAX]; - const struct uci_blob_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 (uci_blob_check_equal(dev->config, attr, cfg)) return DEV_CONFIG_NO_CHANGE; @@ -582,25 +661,50 @@ 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; + } + + 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 device_reload_config(dev, attr); + return change; } 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) { @@ -609,10 +713,9 @@ device_replace(struct device *dev, struct device *odev) safe_list_add(&dep->list, &dev->users); dep->dev = dev; } - device_free(odev); + __devlock--; - if (present) - device_set_present(dev, true); + device_free(odev); } void @@ -637,10 +740,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) @@ -648,41 +789,25 @@ 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; - change = device_set_config(odev, type, config); - if (odev->external) { - system_if_apply_settings(odev, &odev->settings, odev->settings.flags); - change = DEV_CONFIG_APPLIED; - } + 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; @@ -692,8 +817,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; } @@ -735,6 +862,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) @@ -745,6 +874,18 @@ device_dump_status(struct blob_buf *b, struct device *dev) 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); + 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); } s = blobmsg_open_table(b, "statistics");