X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=fa3d00fe8f9273daeae41d37abff2cca9af2c38b;hp=3404feef93da5df07c8a5e2a73a23197ee40daaf;hb=ca2f99575937b183618e425a73b45bcc277b5541;hpb=abbea9ebe8a8b56032e0f85b8572f0671dc094e5 diff --git a/device.c b/device.c index 3404fee..fa3d00f 100644 --- a/device.c +++ b/device.c @@ -45,12 +45,15 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = { [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_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 }, [DEV_ATTR_MULTICAST] = { .name ="multicast", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_LEARNING] = { .name ="learning", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_UNICAST_FLOOD] = { .name ="unicast_flood", .type = BLOBMSG_TYPE_BOOL }, }; const struct uci_blob_param_list device_attr_list = { @@ -171,12 +174,18 @@ device_merge_settings(struct device *dev, struct device_settings *n) s->neigh4reachabletime : os->neigh4reachabletime; n->neigh6reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ? s->neigh6reachabletime : os->neigh6reachabletime; + n->neigh4gcstaletime = s->flags & DEV_OPT_NEIGHGCSTALETIME ? + s->neigh4gcstaletime : os->neigh4gcstaletime; + n->neigh6gcstaletime = s->flags & DEV_OPT_NEIGHGCSTALETIME ? + s->neigh6gcstaletime : os->neigh6gcstaletime; 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->learning = s->learning; + n->unicast_flood = s->unicast_flood; n->flags = s->flags | os->flags | os->valid_flags; } @@ -258,6 +267,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb) s->flags |= DEV_OPT_NEIGHREACHABLETIME; } + if ((cur = tb[DEV_ATTR_NEIGHGCSTALETIME])) { + s->neigh6gcstaletime = s->neigh4gcstaletime = blobmsg_get_u32(cur); + s->flags |= DEV_OPT_NEIGHGCSTALETIME; + } + if ((cur = tb[DEV_ATTR_RPS])) { s->rps = blobmsg_get_bool(cur); s->flags |= DEV_OPT_RPS; @@ -295,6 +309,16 @@ device_init_settings(struct device *dev, struct blob_attr **tb) s->flags |= DEV_OPT_MULTICAST; } + if ((cur = tb[DEV_ATTR_LEARNING])) { + s->learning = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_LEARNING; + } + + if ((cur = tb[DEV_ATTR_UNICAST_FLOOD])) { + s->unicast_flood = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_UNICAST_FLOOD; + } + device_set_disabled(dev, disabled); } @@ -333,6 +357,9 @@ int device_claim(struct device_user *dep) 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) @@ -395,14 +422,14 @@ void device_init_virtual(struct device *dev, const struct device_type *type, con assert(dev); assert(type); - if (name) - strncpy(dev->ifname, name, IFNAMSIZ); - - D(DEVICE, "Initialize device '%s'\n", dev->ifname); + D(DEVICE, "Initialize device '%s'\n", name ? name : ""); INIT_SAFE_LIST(&dev->users); INIT_SAFE_LIST(&dev->aliases); dev->type = type; + if (name) + device_set_ifname(dev, name); + if (!dev->set_state) dev->set_state = set_device_state; } @@ -450,6 +477,14 @@ device_create_default(const char *name, bool external) } struct device * +device_find(const char *name) +{ + struct device *dev; + + return avl_find_element(&devices, name, dev, avl); +} + +struct device * device_get(const char *name, int create) { struct device *dev; @@ -555,6 +590,27 @@ void device_set_ifindex(struct device *dev, int ifindex) device_broadcast_event(dev, DEV_EVENT_UPDATE_IFINDEX); } +int device_set_ifname(struct device *dev, const char *name) +{ + int ret = 0; + + if (!strcmp(dev->ifname, name)) + return 0; + + if (dev->avl.key) + avl_delete(&devices, &dev->avl); + + strncpy(dev->ifname, name, IFNAMSIZ); + + if (dev->avl.key) + ret = avl_insert(&devices, &dev->avl); + + if (ret == 0) + device_broadcast_event(dev, DEV_EVENT_UPDATE_IFNAME); + + return ret; +} + static int device_refcount(struct device *dev) { struct list_head *list; @@ -721,12 +777,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: @@ -924,6 +984,10 @@ device_dump_status(struct blob_buf *b, struct device *dev) blobmsg_add_u32(b, "neigh4reachabletime", st.neigh4reachabletime); blobmsg_add_u32(b, "neigh6reachabletime", st.neigh6reachabletime); } + if (st.flags & DEV_OPT_NEIGHGCSTALETIME) { + blobmsg_add_u32(b, "neigh4gcstaletime", st.neigh4gcstaletime); + blobmsg_add_u32(b, "neigh6gcstaletime", st.neigh6gcstaletime); + } if (st.flags & DEV_OPT_DADTRANSMITS) blobmsg_add_u32(b, "dadtransmits", st.dadtransmits); if (st.flags & DEV_OPT_MULTICAST_TO_UNICAST) @@ -932,6 +996,10 @@ device_dump_status(struct blob_buf *b, struct device *dev) blobmsg_add_u32(b, "multicast_router", st.multicast_router); if (st.flags & DEV_OPT_MULTICAST) blobmsg_add_u8(b, "multicast", st.multicast); + if (st.flags & DEV_OPT_LEARNING) + blobmsg_add_u8(b, "learning", st.learning); + if (st.flags & DEV_OPT_UNICAST_FLOOD) + blobmsg_add_u8(b, "unicast_flood", st.unicast_flood); } s = blobmsg_open_table(b, "statistics");