X-Git-Url: http://git.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=128151a1eb8105116ac04f46cbb7d088c518f9ea;hp=a851037f16415442cf4853d2f18914abf91e52ca;hb=HEAD;hpb=4268193c90bdd1532ee0555dd109a43eb8524b04 diff --git a/device.c b/device.c index a851037..322e009 100644 --- a/device.c +++ b/device.c @@ -18,24 +18,18 @@ #include #include -#include - -#ifdef linux -#include -#endif #include #include "netifd.h" #include "system.h" #include "config.h" +#include "wireless.h" +#include "ubus.h" static struct list_head devtypes = LIST_HEAD_INIT(devtypes); static struct avl_tree devices; -static bool default_ps = true; -static int default_rps_val; -static int default_rps_flow_cnt; -static int default_xps_val; +static struct blob_buf b; static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = { [DEV_ATTR_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING }, @@ -45,6 +39,7 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = { [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_IP6SEGMENTROUTING] = { .name = "ip6segmentrouting", .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 }, @@ -52,8 +47,6 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = { [DEV_ATTR_MLDVERSION] = { .name = "mldversion", .type = BLOBMSG_TYPE_INT32 }, [DEV_ATTR_NEIGHREACHABLETIME] = { .name = "neighreachabletime", .type = BLOBMSG_TYPE_INT32 }, [DEV_ATTR_NEIGHGCSTALETIME] = { .name = "neighgcstaletime", .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 }, @@ -63,6 +56,25 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = { [DEV_ATTR_UNICAST_FLOOD] = { .name ="unicast_flood", .type = BLOBMSG_TYPE_BOOL }, [DEV_ATTR_SENDREDIRECTS] = { .name = "sendredirects", .type = BLOBMSG_TYPE_BOOL }, [DEV_ATTR_NEIGHLOCKTIME] = { .name = "neighlocktime", .type = BLOBMSG_TYPE_INT32 }, + [DEV_ATTR_ISOLATE] = { .name = "isolate", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_DROP_V4_UNICAST_IN_L2_MULTICAST] = { .name = "drop_v4_unicast_in_l2_multicast", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_DROP_V6_UNICAST_IN_L2_MULTICAST] = { .name = "drop_v6_unicast_in_l2_multicast", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_DROP_GRATUITOUS_ARP] = { .name = "drop_gratuitous_arp", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_DROP_UNSOLICITED_NA] = { .name = "drop_unsolicited_na", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_ARP_ACCEPT] = { .name = "arp_accept", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_AUTH] = { .name = "auth", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_AUTH_VLAN] = { .name = "auth_vlan", BLOBMSG_TYPE_ARRAY }, + [DEV_ATTR_SPEED] = { .name = "speed", .type = BLOBMSG_TYPE_INT32 }, + [DEV_ATTR_DUPLEX] = { .name = "duplex", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_VLAN] = { .name = "vlan", .type = BLOBMSG_TYPE_ARRAY }, + [DEV_ATTR_PAUSE] = { .name = "pause", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_ASYM_PAUSE] = { .name = "asym_pause", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_RXPAUSE] = { .name = "rxpause", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_TXPAUSE] = { .name = "txpause", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_AUTONEG] = { .name = "autoneg", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_GRO] = { .name = "gro", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_MASTER] = { .name = "conduit", .type = BLOBMSG_TYPE_STRING }, + [DEV_ATTR_EEE] = { .name = "eee", .type = BLOBMSG_TYPE_BOOL }, }; const struct uci_blob_param_list device_attr_list = { @@ -87,9 +99,6 @@ int device_type_add(struct device_type *devtype) return 0; } -/* Retrieve the device type for the given name. If 'bridge' is true, the type - * must have bridge capabilities - */ struct device_type * device_type_get(const char *tname) { @@ -102,16 +111,44 @@ device_type_get(const char *tname) return NULL; } -void device_lock(void) +static int device_vlan_len(struct kvlist *kv, const void *data) { - __devlock++; + return sizeof(unsigned int); } -void device_unlock(void) +void device_vlan_update(bool done) { - __devlock--; - if (!__devlock) - device_free_unused(NULL); + struct device *dev; + + avl_for_each_element(&devices, dev, avl) { + if (!dev->vlans.update) + continue; + + if (!done) { + if (dev->vlan_aliases.get_len) + kvlist_free(&dev->vlan_aliases); + else + kvlist_init(&dev->vlan_aliases, device_vlan_len); + vlist_update(&dev->vlans); + } else { + vlist_flush(&dev->vlans); + + if (dev->type->vlan_update) + dev->type->vlan_update(dev); + } + } +} + +void device_stp_init(void) +{ + struct device *dev; + + avl_for_each_element(&devices, dev, avl) { + if (!dev->type->stp_init) + continue; + + dev->type->stp_init(dev); + } } static int set_device_state(struct device *dev, bool state) @@ -123,10 +160,24 @@ static int set_device_state(struct device *dev, bool state) if (!dev->ifindex) return -1; + system_if_get_settings(dev, &dev->orig_settings); + /* Only keep orig settings based on what needs to be set */ + dev->orig_settings.valid_flags = dev->orig_settings.flags; + dev->orig_settings.flags &= dev->settings.flags; + system_if_apply_settings(dev, &dev->settings, dev->settings.flags); + system_if_up(dev); - } - else + + system_if_apply_settings_after_up(dev, &dev->settings); + } else { system_if_down(dev); + system_if_apply_settings(dev, &dev->orig_settings, dev->orig_settings.flags); + + /* Restore any settings present in UCI which may have + * failed to apply so that they will be re-attempted + * the next time the device is brought up */ + dev->settings.flags |= dev->settings.valid_flags; + } return 0; } @@ -205,9 +256,10 @@ device_merge_settings(struct device *dev, struct device_settings *n) n->txqueuelen = s->flags & DEV_OPT_TXQUEUELEN ? s->txqueuelen : os->txqueuelen; memcpy(n->macaddr, - (s->flags & DEV_OPT_MACADDR ? s->macaddr : os->macaddr), + (s->flags & (DEV_OPT_MACADDR|DEV_OPT_DEFAULT_MACADDR) ? s->macaddr : os->macaddr), sizeof(n->macaddr)); n->ipv6 = s->flags & DEV_OPT_IPV6 ? s->ipv6 : os->ipv6; + n->ip6segmentrouting = s->flags & DEV_OPT_IP6SEGMENTROUTING ? s->ip6segmentrouting : os->ip6segmentrouting; 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; @@ -234,9 +286,71 @@ device_merge_settings(struct device *dev, struct device_settings *n) n->unicast_flood = s->unicast_flood; n->sendredirects = s->flags & DEV_OPT_SENDREDIRECTS ? s->sendredirects : os->sendredirects; + n->drop_v4_unicast_in_l2_multicast = s->flags & DEV_OPT_DROP_V4_UNICAST_IN_L2_MULTICAST ? + s->drop_v4_unicast_in_l2_multicast : os->drop_v4_unicast_in_l2_multicast; + n->drop_v6_unicast_in_l2_multicast = s->flags & DEV_OPT_DROP_V6_UNICAST_IN_L2_MULTICAST ? + s->drop_v6_unicast_in_l2_multicast : os->drop_v6_unicast_in_l2_multicast; + n->drop_gratuitous_arp = s->flags & DEV_OPT_DROP_GRATUITOUS_ARP ? + s->drop_gratuitous_arp : os->drop_gratuitous_arp; + n->drop_unsolicited_na = s->flags & DEV_OPT_DROP_UNSOLICITED_NA ? + s->drop_unsolicited_na : os->drop_unsolicited_na; + n->arp_accept = s->flags & DEV_OPT_ARP_ACCEPT ? + s->arp_accept : os->arp_accept; + n->auth = s->flags & DEV_OPT_AUTH ? s->auth : os->auth; + n->speed = s->flags & DEV_OPT_SPEED ? s->speed : os->speed; + n->duplex = s->flags & DEV_OPT_DUPLEX ? s->duplex : os->duplex; + n->pause = s->flags & DEV_OPT_PAUSE ? s->pause : os->pause; + n->asym_pause = s->flags & DEV_OPT_ASYM_PAUSE ? s->asym_pause : os->asym_pause; + n->rxpause = s->flags & DEV_OPT_RXPAUSE ? s->rxpause : os->rxpause; + n->txpause = s->flags & DEV_OPT_TXPAUSE ? s->txpause : os->txpause; + n->autoneg = s->flags & DEV_OPT_AUTONEG ? s->autoneg : os->autoneg; + n->gro = s->flags & DEV_OPT_GRO ? s->gro : os->gro; + n->eee = s->flags & DEV_OPT_EEE ? s->eee : os->eee; + n->master_ifindex = s->flags & DEV_OPT_MASTER ? s->master_ifindex : os->master_ifindex; n->flags = s->flags | os->flags | os->valid_flags; } +static bool device_fill_vlan_range(struct device_vlan_range *r, const char *val) +{ + unsigned long cur_start, cur_end; + char *sep; + + cur_start = strtoul(val, &sep, 0); + cur_end = cur_start; + + if (*sep == '-') + cur_end = strtoul(sep + 1, &sep, 0); + if (*sep || cur_end < cur_start) + return false; + + r->start = cur_start; + r->end = cur_end; + + return true; +} + +static void +device_set_extra_vlans(struct device *dev, struct blob_attr *data) +{ + struct blob_attr *cur; + int n_vlans; + size_t rem; + + dev->n_extra_vlan = 0; + if (!data) + return; + + n_vlans = blobmsg_check_array(data, BLOBMSG_TYPE_STRING); + if (n_vlans < 1) + return; + + dev->extra_vlan = realloc(dev->extra_vlan, n_vlans * sizeof(*dev->extra_vlan)); + blobmsg_for_each_attr(cur, data, rem) + if (device_fill_vlan_range(&dev->extra_vlan[dev->n_extra_vlan], + blobmsg_get_string(cur))) + dev->n_extra_vlan++; +} + void device_init_settings(struct device *dev, struct blob_attr **tb) { @@ -245,7 +359,10 @@ device_init_settings(struct device *dev, struct blob_attr **tb) struct ether_addr *ea; bool disabled = false; - s->flags = 0; + if (dev->wireless) + s->flags &= DEV_OPT_ISOLATE; + else + s->flags = 0; if ((cur = tb[DEV_ATTR_ENABLED])) disabled = !blobmsg_get_bool(cur); @@ -277,6 +394,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb) s->flags |= DEV_OPT_IPV6; } + if ((cur = tb[DEV_ATTR_IP6SEGMENTROUTING])) { + s->ip6segmentrouting = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_IP6SEGMENTROUTING; + } + if ((cur = tb[DEV_ATTR_PROMISC])) { s->promisc = blobmsg_get_bool(cur); s->flags |= DEV_OPT_PROMISC; @@ -286,7 +408,7 @@ device_init_settings(struct device *dev, struct blob_attr **tb) 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)); + D(DEVICE, "Failed to resolve rpfilter: %s", (char *) blobmsg_data(cur)); } if ((cur = tb[DEV_ATTR_ACCEPTLOCAL])) { @@ -299,7 +421,7 @@ device_init_settings(struct device *dev, struct blob_attr **tb) if (s->igmpversion >= 1 && s->igmpversion <= 3) s->flags |= DEV_OPT_IGMPVERSION; else - DPRINTF("Failed to resolve igmpversion: %d\n", blobmsg_get_u32(cur)); + D(DEVICE, "Failed to resolve igmpversion: %d", blobmsg_get_u32(cur)); } if ((cur = tb[DEV_ATTR_MLDVERSION])) { @@ -307,7 +429,7 @@ device_init_settings(struct device *dev, struct blob_attr **tb) if (s->mldversion >= 1 && s->mldversion <= 2) s->flags |= DEV_OPT_MLDVERSION; else - DPRINTF("Failed to resolve mldversion: %d\n", blobmsg_get_u32(cur)); + D(DEVICE, "Failed to resolve mldversion: %d", blobmsg_get_u32(cur)); } if ((cur = tb[DEV_ATTR_NEIGHREACHABLETIME])) { @@ -325,20 +447,6 @@ device_init_settings(struct device *dev, struct blob_attr **tb) s->flags |= DEV_OPT_NEIGHLOCKTIME; } - 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; @@ -354,7 +462,7 @@ device_init_settings(struct device *dev, struct blob_attr **tb) 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)); + D(DEVICE, "Invalid value: %d - (Use 0: never, 1: learn, 2: always)", blobmsg_get_u32(cur)); } if ((cur = tb[DEV_ATTR_MULTICAST_FAST_LEAVE])) { @@ -382,6 +490,100 @@ device_init_settings(struct device *dev, struct blob_attr **tb) s->flags |= DEV_OPT_SENDREDIRECTS; } + if ((cur = tb[DEV_ATTR_ISOLATE])) { + s->isolate = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_ISOLATE; + } + + if ((cur = tb[DEV_ATTR_DROP_V4_UNICAST_IN_L2_MULTICAST])) { + s->drop_v4_unicast_in_l2_multicast = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_DROP_V4_UNICAST_IN_L2_MULTICAST; + } + + if ((cur = tb[DEV_ATTR_DROP_V6_UNICAST_IN_L2_MULTICAST])) { + s->drop_v6_unicast_in_l2_multicast = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_DROP_V6_UNICAST_IN_L2_MULTICAST; + } + + if ((cur = tb[DEV_ATTR_DROP_GRATUITOUS_ARP])) { + s->drop_gratuitous_arp = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_DROP_GRATUITOUS_ARP; + } + + if ((cur = tb[DEV_ATTR_DROP_UNSOLICITED_NA])) { + s->drop_unsolicited_na = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_DROP_UNSOLICITED_NA; + } + + if ((cur = tb[DEV_ATTR_ARP_ACCEPT])) { + s->arp_accept = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_ARP_ACCEPT; + } + + if ((cur = tb[DEV_ATTR_AUTH])) { + s->auth = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_AUTH; + } + + if ((cur = tb[DEV_ATTR_SPEED])) { + s->speed = blobmsg_get_u32(cur); + s->flags |= DEV_OPT_SPEED; + } + + if ((cur = tb[DEV_ATTR_DUPLEX])) { + s->duplex = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_DUPLEX; + } + + if ((cur = tb[DEV_ATTR_PAUSE])) { + s->pause = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_PAUSE; + } + + if ((cur = tb[DEV_ATTR_ASYM_PAUSE])) { + s->asym_pause = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_ASYM_PAUSE; + } + + if ((cur = tb[DEV_ATTR_RXPAUSE])) { + s->rxpause = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_RXPAUSE; + } + + if ((cur = tb[DEV_ATTR_TXPAUSE])) { + s->txpause = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_TXPAUSE; + } + + if ((cur = tb[DEV_ATTR_AUTONEG])) { + s->autoneg = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_AUTONEG; + } + + if ((cur = tb[DEV_ATTR_GRO])) { + s->gro = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_GRO; + } + + if ((cur = tb[DEV_ATTR_MASTER])) { + char *ifname = blobmsg_get_string(cur); + s->master_ifindex = if_nametoindex(ifname); + s->flags |= DEV_OPT_MASTER; + } + + if ((cur = tb[DEV_ATTR_EEE])) { + s->eee = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_EEE; + } + + /* Remember the settings present in UCI */ + s->valid_flags = s->flags; + + cur = tb[DEV_ATTR_AUTH_VLAN]; + free(dev->config_auth_vlans); + dev->config_auth_vlans = cur ? blob_memdup(cur) : NULL; + + device_set_extra_vlans(dev, tb[DEV_ATTR_VLAN]); device_set_disabled(dev, disabled); } @@ -390,6 +592,17 @@ static void __init dev_init(void) avl_init(&devices, avl_strcmp, true, NULL); } +static int device_release_cb(void *ctx, struct safe_list *list) +{ + struct device_user *dep = container_of(list, struct device_user, list); + + if (!dep->dev || !dep->claimed) + return 0; + + device_release(dep); + return 0; +} + static int device_broadcast_cb(void *ctx, struct safe_list *list) { struct device_user *dep = container_of(list, struct device_user, list); @@ -406,10 +619,64 @@ static int device_broadcast_cb(void *ctx, struct safe_list *list) void device_broadcast_event(struct device *dev, enum device_event ev) { + static const char * const event_names[] = { + [DEV_EVENT_ADD] = "add", + [DEV_EVENT_REMOVE] = "remove", + [DEV_EVENT_UP] = "up", + [DEV_EVENT_DOWN] = "down", + [DEV_EVENT_AUTH_UP] = "auth_up", + [DEV_EVENT_LINK_UP] = "link_up", + [DEV_EVENT_LINK_DOWN] = "link_down", + [DEV_EVENT_TOPO_CHANGE] = "topo_change", + }; 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); + + if (ev >= ARRAY_SIZE(event_names) || !event_names[ev] || !dev->ifname[0]) + return; + + blob_buf_init(&b, 0); + blobmsg_add_string(&b, "name", dev->ifname); + blobmsg_add_u8(&b, "auth_status", dev->auth_status); + blobmsg_add_u8(&b, "present", dev->present); + blobmsg_add_u8(&b, "active", dev->active); + blobmsg_add_u8(&b, "link_active", dev->link_active); + netifd_ubus_device_notify(event_names[ev], b.head, -1); +} + +static void +device_fill_default_settings(struct device *dev) +{ + struct device_settings *s = &dev->settings; + struct ether_addr *ea; + const char *master; + int ret; + + if (!(s->flags & DEV_OPT_MACADDR)) { + ea = config_get_default_macaddr(dev->ifname); + if (ea) { + memcpy(s->macaddr, ea, 6); + s->flags |= DEV_OPT_DEFAULT_MACADDR; + } + } + + if (!(s->flags & DEV_OPT_GRO)) { + ret = config_get_default_gro(dev->ifname); + if (ret >= 0) { + s->gro = ret; + s->flags |= DEV_OPT_GRO; + } + } + + if (!(s->flags & DEV_OPT_MASTER)) { + master = config_get_default_conduit(dev->ifname); + if (master) { + s->master_ifindex = if_nametoindex(master); + s->flags |= DEV_OPT_MASTER; + } + } } int device_claim(struct device_user *dep) @@ -424,11 +691,12 @@ int device_claim(struct device_user *dep) return -1; dep->claimed = true; - D(DEVICE, "Claim %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active + 1); + D(DEVICE, "Claim %s %s, new active count: %d", dev->type->name, dev->ifname, dev->active + 1); if (++dev->active != 1) return 0; device_broadcast_event(dev, DEV_EVENT_SETUP); + device_fill_default_settings(dev); if (dev->external) { /* Get ifindex for external claimed devices so a valid */ /* ifindex is in place avoiding possible race conditions */ @@ -443,7 +711,7 @@ int device_claim(struct device_user *dep) if (ret == 0) device_broadcast_event(dev, DEV_EVENT_UP); else { - D(DEVICE, "claim %s %s failed: %d\n", dev->type->name, dev->ifname, ret); + D(DEVICE, "claim %s %s failed: %d", dev->type->name, dev->ifname, ret); dev->active = 0; dep->claimed = false; } @@ -460,7 +728,7 @@ void device_release(struct device_user *dep) dep->claimed = false; dev->active--; - D(DEVICE, "Release %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active); + D(DEVICE, "Release %s %s, new active count: %d", dev->type->name, dev->ifname, dev->active); assert(dev->active >= 0); if (dev->active) @@ -484,28 +752,39 @@ int device_check_state(struct device *dev) return dev->type->check_state(dev); } -void device_init_virtual(struct device *dev, struct device_type *type, const char *name) +int device_init_virtual(struct device *dev, struct device_type *type, const char *name) { assert(dev); assert(type); - D(DEVICE, "Initialize device '%s'\n", name ? name : ""); + D(DEVICE, "Initialize device '%s'", name ? name : ""); INIT_SAFE_LIST(&dev->users); INIT_SAFE_LIST(&dev->aliases); dev->type = type; - if (name) - device_set_ifname(dev, name); + if (name) { + int ret; + + ret = device_set_ifname(dev, name); + if (ret < 0) { + netifd_log_message(L_WARNING, "Failed to initalize device '%s'\n", name); + return ret; + } + } if (!dev->set_state) dev->set_state = set_device_state; + + return 0; } int device_init(struct device *dev, struct device_type *type, const char *ifname) { int ret; - device_init_virtual(dev, type, ifname); + ret = device_init_virtual(dev, type, ifname); + if (ret < 0) + return ret; dev->avl.key = dev->ifname; @@ -514,9 +793,6 @@ int device_init(struct device *dev, struct device_type *type, const char *ifname return ret; system_if_clear_state(dev); - device_check_state(dev); - dev->settings.rps = default_ps; - dev->settings.xps = default_ps; return 0; } @@ -529,17 +805,26 @@ device_create_default(const char *name, bool external) if (!external && system_if_force_external(name)) return NULL; - D(DEVICE, "Create simple device '%s'\n", name); + D(DEVICE, "Create simple device '%s'", 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); + + if (device_init(dev, &simple_device_type, name) < 0) { + device_cleanup(dev); + free(dev); + return NULL; + } + dev->default_config = true; if (external) system_if_apply_settings(dev, &dev->settings, dev->settings.flags); + + device_check_state(dev); + return dev; } @@ -552,17 +837,18 @@ device_find(const char *name) } struct device * -device_get(const char *name, int create) +__device_get(const char *name, int create, bool check_vlan) { struct device *dev; - if (strchr(name, '.')) + dev = avl_find_element(&devices, name, dev, avl); + + if (!dev && check_vlan && strchr(name, '.')) return get_vlan_device_chain(name, create); if (name[0] == '@') return device_alias_get(name + 1); - 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); @@ -584,7 +870,7 @@ device_delete(struct device *dev) if (!dev->avl.key) return; - D(DEVICE, "Delete device '%s' from list\n", dev->ifname); + D(DEVICE, "Delete device '%s' from list", dev->ifname); avl_delete(&devices, &dev->avl); dev->avl.key = NULL; } @@ -601,15 +887,15 @@ static int device_cleanup_cb(void *ctx, struct safe_list *list) void device_cleanup(struct device *dev) { - D(DEVICE, "Clean up device '%s'\n", dev->ifname); + D(DEVICE, "Clean up device '%s'", 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); } -static void __device_set_present(struct device *dev, bool state) +static void __device_set_present(struct device *dev, bool state, bool force) { - if (dev->present == state) + if (dev->present == state && !force) return; dev->present = state; @@ -624,7 +910,37 @@ device_refresh_present(struct device *dev) if (dev->disabled || dev->deferred) state = false; - __device_set_present(dev, state); + __device_set_present(dev, state, false); +} + +void +device_set_auth_status(struct device *dev, bool value, struct blob_attr *vlans) +{ + if (!value) + vlans = NULL; + else if (!blob_attr_equal(vlans, dev->auth_vlans)) + device_set_auth_status(dev, false, NULL); + + free(dev->auth_vlans); + dev->auth_vlans = vlans ? blob_memdup(vlans) : NULL; + + if (dev->auth_status == value) + return; + + dev->auth_status = value; + if (!dev->present) + return; + + if (dev->auth_status) { + device_broadcast_event(dev, DEV_EVENT_AUTH_UP); + return; + } + + device_broadcast_event(dev, DEV_EVENT_LINK_DOWN); + if (!dev->link_active) + return; + + device_broadcast_event(dev, DEV_EVENT_LINK_UP); } void device_set_present(struct device *dev, bool state) @@ -632,9 +948,14 @@ void device_set_present(struct device *dev, bool state) if (dev->sys_present == state) return; - D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" ); + D(DEVICE, "%s '%s' %s present", dev->type->name, dev->ifname, state ? "is now" : "is no longer" ); dev->sys_present = state; - device_refresh_present(dev); + if (!state) + __device_set_present(dev, state, true); + else + device_refresh_present(dev); + if (!state) + safe_list_for_each(&dev->users, device_release_cb, NULL); } void device_set_link(struct device *dev, bool state) @@ -645,6 +966,8 @@ void device_set_link(struct device *dev, bool state) netifd_log_message(L_NOTICE, "%s '%s' link is %s\n", dev->type->name, dev->ifname, state ? "up" : "down" ); dev->link_active = state; + if (!state) + dev->auth_status = false; device_broadcast_event(dev, state ? DEV_EVENT_LINK_UP : DEV_EVENT_LINK_DOWN); } @@ -664,10 +987,16 @@ int device_set_ifname(struct device *dev, const char *name) if (!strcmp(dev->ifname, name)) return 0; + if (strlen(name) > sizeof(dev->ifname) - 1) { + netifd_log_message(L_WARNING, "Cannot set device name: '%s' is longer than max size %zd\n", + name, sizeof(dev->ifname) - 1); + return -1; + } + if (dev->avl.key) avl_delete(&devices, &dev->avl); - strncpy(dev->ifname, name, IFNAMSIZ); + strcpy(dev->ifname, name); if (dev->avl.key) ret = avl_insert(&devices, &dev->avl); @@ -705,7 +1034,7 @@ __device_add_user(struct device_user *dep, struct device *dev) head = &dev->users; safe_list_add(&dep->list, head); - D(DEVICE, "Add user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev)); + D(DEVICE, "Add user for device '%s', refcount=%d", dev->ifname, device_refcount(dev)); if (dep->cb && dev->present) { dep->cb(dep, DEV_EVENT_ADD); @@ -731,25 +1060,41 @@ void device_add_user(struct device_user *dep, struct device *dev) __device_add_user(dep, dev); } -void +static void device_free(struct device *dev) { __devlock++; + free(dev->auth_vlans); free(dev->config); device_cleanup(dev); + free(dev->config_auth_vlans); + free(dev->extra_vlan); dev->type->free(dev); __devlock--; } static void -__device_free_unused(struct device *dev) +__device_free_unused(struct uloop_timeout *timeout) { - if (!safe_list_empty(&dev->users) || - !safe_list_empty(&dev->aliases) || - dev->current_config || __devlock) - return; + struct device *dev, *tmp; - device_free(dev); + avl_for_each_element_safe(&devices, dev, avl, tmp) { + if (!safe_list_empty(&dev->users) || + !safe_list_empty(&dev->aliases) || + dev->current_config) + continue; + + device_free(dev); + } +} + +void device_free_unused(void) +{ + static struct uloop_timeout free_timer = { + .cb = __device_free_unused, + }; + + uloop_timeout_set(&free_timer, 1); } void device_remove_user(struct device_user *dep) @@ -765,20 +1110,8 @@ void device_remove_user(struct device_user *dep) 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); -} - -void -device_free_unused(struct device *dev) -{ - struct device *tmp; - - if (dev) - return __device_free_unused(dev); - - avl_for_each_element_safe(&devices, dev, avl, tmp) - __device_free_unused(dev); + D(DEVICE, "Remove user for device '%s', refcount=%d", dev->ifname, device_refcount(dev)); + device_free_unused(); } void @@ -792,9 +1125,22 @@ device_init_pending(void) dev->type->config_init(dev); dev->config_pending = false; + device_check_state(dev); } } +bool +device_check_ip6segmentrouting(void) +{ + struct device *dev; + bool ip6segmentrouting = false; + + avl_for_each_element(&devices, dev, avl) + ip6segmentrouting |= dev->settings.ip6segmentrouting; + + return ip6segmentrouting; +} + static enum dev_change_type device_set_config(struct device *dev, struct device_type *type, struct blob_attr *attr) @@ -839,7 +1185,7 @@ device_apply_config(struct device *dev, struct device_type *type, switch (change) { case DEV_CONFIG_RESTART: case DEV_CONFIG_APPLIED: - D(DEVICE, "Device '%s': config applied\n", dev->ifname); + D(DEVICE, "Device '%s': config applied", dev->ifname); config = blob_memdup(config); free(dev->config); dev->config = config; @@ -857,7 +1203,7 @@ device_apply_config(struct device *dev, struct device_type *type, } break; case DEV_CONFIG_NO_CHANGE: - D(DEVICE, "Device '%s': no configuration change\n", dev->ifname); + D(DEVICE, "Device '%s': no configuration change", dev->ifname); break; case DEV_CONFIG_RECREATE: break; @@ -869,14 +1215,18 @@ device_apply_config(struct device *dev, struct device_type *type, static void device_replace(struct device *dev, struct device *odev) { - struct device_user *dep, *tmp; + struct device_user *dep; __devlock++; if (odev->present) device_set_present(odev, false); - list_for_each_entry_safe(dep, tmp, &odev->users.list, list.list) { + while (!list_empty(&odev->users.list)) { + dep = list_first_entry(&odev->users.list, struct device_user, list.list); device_release(dep); + if (!dep->dev) + continue; + safe_list_del(&dep->list); __device_add_user(dep, dev); } @@ -914,48 +1264,6 @@ device_reset_old(void) } } -void -device_set_default_ps(bool state, int xps, int rps, int rps_flow_cnt) -{ - struct device *dev; - - if ((state == default_ps) && (default_rps_val == rps) && - (default_xps_val == xps) && (default_rps_flow_cnt == rps_flow_cnt)) - return; - - default_ps = state; - default_rps_val = rps; - default_rps_flow_cnt = rps_flow_cnt; - default_xps_val = xps; - - 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; - s->rps_val = default_rps_val; - s->rps_flow_cnt = default_rps_flow_cnt; - apply_mask |= DEV_OPT_RPS; - } - - if (!(s->flags & DEV_OPT_XPS)) { - s->xps = default_ps; - s->xps_val = default_xps_val; - 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, struct device_type *type, struct blob_attr *config) @@ -969,14 +1277,14 @@ device_create(const char *name, struct device_type *type, change = device_apply_config(odev, type, config); switch (change) { case DEV_CONFIG_RECREATE: - D(DEVICE, "Device '%s': recreate device\n", odev->ifname); + D(DEVICE, "Device '%s': recreate device", odev->ifname); device_delete(odev); break; default: return odev; } } else - D(DEVICE, "Create new device '%s' (%s)\n", name, type->name); + D(DEVICE, "Create new device '%s' (%s)", name, type->name); config = blob_memdup(config); if (!config) @@ -996,6 +1304,8 @@ device_create(const char *name, struct device_type *type, dev->config_pending = false; } + device_check_state(dev); + return dev; } @@ -1026,6 +1336,7 @@ device_dump_status(struct blob_buf *b, struct device *dev) blobmsg_add_u8(b, "up", !!dev->active); blobmsg_add_u8(b, "carrier", !!dev->link_active); + blobmsg_add_u8(b, "auth_status", !!dev->auth_status); if (dev->type->dump_info) dev->type->dump_info(dev, b); @@ -1034,6 +1345,13 @@ device_dump_status(struct blob_buf *b, struct device *dev) if (dev->active) { device_merge_settings(dev, &st); + if (st.flags & DEV_OPT_MASTER) { + char buf[64], *devname; + + devname = if_indextoname(st.master_ifindex, buf); + if (devname) + blobmsg_add_string(b, "conduit", devname); + } if (st.flags & DEV_OPT_MTU) blobmsg_add_u32(b, "mtu", st.mtu); if (st.flags & DEV_OPT_MTU6) @@ -1044,6 +1362,8 @@ device_dump_status(struct blob_buf *b, struct device *dev) 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_IP6SEGMENTROUTING) + blobmsg_add_u8(b, "ip6segmentrouting", st.ip6segmentrouting); if (st.flags & DEV_OPT_PROMISC) blobmsg_add_u8(b, "promisc", st.promisc); if (st.flags & DEV_OPT_RPFILTER) @@ -1080,6 +1400,22 @@ device_dump_status(struct blob_buf *b, struct device *dev) blobmsg_add_u8(b, "unicast_flood", st.unicast_flood); if (st.flags & DEV_OPT_SENDREDIRECTS) blobmsg_add_u8(b, "sendredirects", st.sendredirects); + if (st.flags & DEV_OPT_DROP_V4_UNICAST_IN_L2_MULTICAST) + blobmsg_add_u8(b, "drop_v4_unicast_in_l2_multicast", st.drop_v4_unicast_in_l2_multicast); + if (st.flags & DEV_OPT_DROP_V6_UNICAST_IN_L2_MULTICAST) + blobmsg_add_u8(b, "drop_v6_unicast_in_l2_multicast", st.drop_v6_unicast_in_l2_multicast); + if (st.flags & DEV_OPT_DROP_GRATUITOUS_ARP) + blobmsg_add_u8(b, "drop_gratuitous_arp", st.drop_gratuitous_arp); + if (st.flags & DEV_OPT_DROP_UNSOLICITED_NA) + blobmsg_add_u8(b, "drop_unsolicited_na", st.drop_unsolicited_na); + if (st.flags & DEV_OPT_ARP_ACCEPT) + blobmsg_add_u8(b, "arp_accept", st.arp_accept); + if (st.flags & DEV_OPT_AUTH) + blobmsg_add_u8(b, "auth", st.auth); + if (st.flags & DEV_OPT_GRO) + blobmsg_add_u8(b, "gro", st.gro); + if (st.flags & DEV_OPT_EEE) + blobmsg_add_u8(b, "eee", st.eee); } s = blobmsg_open_table(b, "statistics"); @@ -1094,3 +1430,16 @@ static void __init simple_device_type_init(void) { device_type_add(&simple_device_type); } + +void device_hotplug_event(const char *name, bool add) +{ + struct device *dev; + + wireless_device_hotplug_event(name, add); + + dev = device_find(name); + if (!dev || dev->type != &simple_device_type) + return; + + device_set_present(dev, add); +}