X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=bridge.c;h=1c163cd9d2a56a7737684a6ac9f44640153b158f;hp=1d02f8375753c156c22c6875059146f7d3420749;hb=5e0fb81b9a9a8ad8ef582d8d29d7d243e1903100;hpb=a9fd870450e82f31cba681651656276dfc1c39ac diff --git a/bridge.c b/bridge.c index 1d02f83..1c163cd 100644 --- a/bridge.c +++ b/bridge.c @@ -26,10 +26,18 @@ enum { BRIDGE_ATTR_IFNAME, BRIDGE_ATTR_STP, BRIDGE_ATTR_FORWARD_DELAY, + BRIDGE_ATTR_PRIORITY, BRIDGE_ATTR_IGMP_SNOOP, BRIDGE_ATTR_AGEING_TIME, BRIDGE_ATTR_HELLO_TIME, BRIDGE_ATTR_MAX_AGE, + BRIDGE_ATTR_BRIDGE_EMPTY, + BRIDGE_ATTR_MULTICAST_QUERIER, + BRIDGE_ATTR_HASH_MAX, + BRIDGE_ATTR_ROBUSTNESS, + BRIDGE_ATTR_QUERY_INTERVAL, + BRIDGE_ATTR_QUERY_RESPONSE_INTERVAL, + BRIDGE_ATTR_LAST_MEMBER_INTERVAL, __BRIDGE_ATTR_MAX }; @@ -37,17 +45,25 @@ static const struct blobmsg_policy bridge_attrs[__BRIDGE_ATTR_MAX] = { [BRIDGE_ATTR_IFNAME] = { "ifname", BLOBMSG_TYPE_ARRAY }, [BRIDGE_ATTR_STP] = { "stp", BLOBMSG_TYPE_BOOL }, [BRIDGE_ATTR_FORWARD_DELAY] = { "forward_delay", BLOBMSG_TYPE_INT32 }, + [BRIDGE_ATTR_PRIORITY] = { "priority", BLOBMSG_TYPE_INT32 }, [BRIDGE_ATTR_AGEING_TIME] = { "ageing_time", BLOBMSG_TYPE_INT32 }, [BRIDGE_ATTR_HELLO_TIME] = { "hello_time", BLOBMSG_TYPE_INT32 }, [BRIDGE_ATTR_MAX_AGE] = { "max_age", BLOBMSG_TYPE_INT32 }, [BRIDGE_ATTR_IGMP_SNOOP] = { "igmp_snooping", BLOBMSG_TYPE_BOOL }, + [BRIDGE_ATTR_BRIDGE_EMPTY] = { "bridge_empty", BLOBMSG_TYPE_BOOL }, + [BRIDGE_ATTR_MULTICAST_QUERIER] = { "multicast_querier", BLOBMSG_TYPE_BOOL }, + [BRIDGE_ATTR_HASH_MAX] = { "hash_max", BLOBMSG_TYPE_INT32 }, + [BRIDGE_ATTR_ROBUSTNESS] = { "robustness", BLOBMSG_TYPE_INT32 }, + [BRIDGE_ATTR_QUERY_INTERVAL] = { "query_interval", BLOBMSG_TYPE_INT32 }, + [BRIDGE_ATTR_QUERY_RESPONSE_INTERVAL] = { "query_response_interval", BLOBMSG_TYPE_INT32 }, + [BRIDGE_ATTR_LAST_MEMBER_INTERVAL] = { "last_member_interval", BLOBMSG_TYPE_INT32 }, }; -static const union config_param_info bridge_attr_info[__BRIDGE_ATTR_MAX] = { +static const struct uci_blob_param_info bridge_attr_info[__BRIDGE_ATTR_MAX] = { [BRIDGE_ATTR_IFNAME] = { .type = BLOBMSG_TYPE_STRING }, }; -static const struct config_param_list bridge_attr_list = { +static const struct uci_blob_param_list bridge_attr_list = { .n_params = __BRIDGE_ATTR_MAX, .params = bridge_attrs, .info = bridge_attr_info, @@ -84,9 +100,11 @@ struct bridge_state { bool active; bool force_active; + struct uloop_timeout retry; struct bridge_member *primary_port; struct vlist_tree members; int n_present; + int n_failed; }; struct bridge_member { @@ -136,9 +154,37 @@ bridge_disable_member(struct bridge_member *bm) system_bridge_delif(&bst->dev, bm->dev.dev); device_release(&bm->dev); + device_broadcast_event(&bst->dev, DEV_EVENT_TOPO_CHANGE); + + return 0; +} + +static int +bridge_enable_interface(struct bridge_state *bst) +{ + int ret; + + if (bst->active) + return 0; + + ret = system_bridge_addbr(&bst->dev, &bst->config); + if (ret < 0) + return ret; + + bst->active = true; return 0; } +static void +bridge_disable_interface(struct bridge_state *bst) +{ + if (!bst->active) + return; + + system_bridge_delbr(&bst->dev); + bst->active = false; +} + static int bridge_enable_member(struct bridge_member *bm) { @@ -148,6 +194,16 @@ bridge_enable_member(struct bridge_member *bm) if (!bm->present) return 0; + ret = bridge_enable_interface(bst); + if (ret) + goto error; + + /* Disable IPv6 for bridge members */ + if (!(bm->dev.dev->settings.flags & DEV_OPT_IPV6)) { + bm->dev.dev->settings.ipv6 = 0; + bm->dev.dev->settings.flags |= DEV_OPT_IPV6; + } + ret = device_claim(&bm->dev); if (ret < 0) goto error; @@ -158,11 +214,17 @@ bridge_enable_member(struct bridge_member *bm) goto error; } + device_set_present(&bst->dev, true); + device_broadcast_event(&bst->dev, DEV_EVENT_TOPO_CHANGE); + return 0; error: + bst->n_failed++; bm->present = false; bst->n_present--; + device_release(&bm->dev); + return ret; } @@ -174,7 +236,7 @@ bridge_remove_member(struct bridge_member *bm) if (!bm->present) return; - if (bm == bst->primary_port); + if (bm == bst->primary_port) bridge_reset_primary(bst); if (bst->dev.active) @@ -183,6 +245,9 @@ bridge_remove_member(struct bridge_member *bm) bm->present = false; bm->bst->n_present--; + if (bst->config.bridge_empty) + return; + bst->force_active = false; if (bst->n_present == 0) device_set_present(&bst->dev, false); @@ -212,6 +277,15 @@ bridge_free_member(struct bridge_member *bm) } static void +bridge_check_retry(struct bridge_state *bst) +{ + if (!bst->n_failed) + return; + + uloop_timeout_set(&bst->retry, 100); +} + +static void bridge_member_cb(struct device_user *dev, enum device_event ev) { struct bridge_member *bm = container_of(dev, struct bridge_member, dev); @@ -224,10 +298,17 @@ bridge_member_cb(struct device_user *dev, enum device_event ev) bm->present = true; bst->n_present++; - if (bst->dev.active) - bridge_enable_member(bm); - else if (bst->n_present == 1) + if (bst->n_present == 1) device_set_present(&bst->dev, true); + if (bst->dev.active && !bridge_enable_member(bm)) { + /* + * Adding a bridge member can overwrite the bridge mtu + * in the kernel, apply the bridge settings in case the + * bridge mtu is set + */ + system_if_apply_settings(&bst->dev, &bst->dev.settings, + DEV_OPT_MTU | DEV_OPT_MTU6); + } break; case DEV_EVENT_REMOVE: @@ -255,7 +336,7 @@ bridge_set_down(struct bridge_state *bst) vlist_for_each_element(&bst->members, bm, node) bridge_disable_member(bm); - system_bridge_delbr(&bst->dev); + bridge_disable_interface(bst); return 0; } @@ -266,19 +347,23 @@ bridge_set_up(struct bridge_state *bst) struct bridge_member *bm; int ret; - if (!bst->force_active && !bst->n_present) - return -ENOENT; + if (!bst->n_present) { + if (!bst->force_active) + return -ENOENT; - ret = system_bridge_addbr(&bst->dev, &bst->config); - if (ret < 0) - goto out; + ret = bridge_enable_interface(bst); + if (ret) + return ret; + } + bst->n_failed = 0; vlist_for_each_element(&bst->members, bm, node) bridge_enable_member(bm); + bridge_check_retry(bst); if (!bst->force_active && !bst->n_present) { /* initialization of all member interfaces failed */ - system_bridge_delbr(&bst->dev); + bridge_disable_interface(bst); device_set_present(&bst->dev, false); return -ENOENT; } @@ -288,7 +373,6 @@ bridge_set_up(struct bridge_state *bst) if (ret < 0) bridge_set_down(bst); -out: return ret; } @@ -311,13 +395,20 @@ bridge_create_member(struct bridge_state *bst, struct device *dev, bool hotplug) struct bridge_member *bm; bm = calloc(1, sizeof(*bm) + strlen(dev->ifname) + 1); + if (!bm) + return NULL; + bm->bst = bst; bm->dev.cb = bridge_member_cb; bm->dev.hotplug = hotplug; strcpy(bm->name, dev->ifname); bm->dev.dev = dev; vlist_add(&bst->members, &bm->node, bm->name); - if (hotplug) + // Need to look up the bridge member again as the above + // created pointer will be freed in case the bridge member + // already existed + bm = vlist_find(&bst->members, dev->ifname, bm, node); + if (hotplug && bm) bm->node.version = -1; return bm; @@ -412,6 +503,7 @@ bridge_free(struct device *dev) bst = container_of(dev, struct bridge_state, dev); vlist_flush_all(&bst->members); + free(bst->config_data); free(bst); } @@ -442,14 +534,20 @@ bridge_config_init(struct device *dev) bst = container_of(dev, struct bridge_state, dev); - if (!bst->ifnames) - return; + if (bst->config.bridge_empty) { + bst->force_active = true; + device_set_present(&bst->dev, true); + } + bst->n_failed = 0; vlist_update(&bst->members); - blobmsg_for_each_attr(cur, bst->ifnames, rem) { - bridge_add_member(bst, blobmsg_data(cur)); + if (bst->ifnames) { + blobmsg_for_each_attr(cur, bst->ifnames, rem) { + bridge_add_member(bst, blobmsg_data(cur)); + } } vlist_flush(&bst->members); + bridge_check_retry(bst); } static void @@ -462,6 +560,14 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb) cfg->stp = false; cfg->forward_delay = 2; cfg->igmp_snoop = true; + cfg->multicast_querier = true; + cfg->robustness = 2; + cfg->query_interval = 12500; + cfg->query_response_interval = 1000; + cfg->last_member_interval = 100; + cfg->hash_max = 512; + cfg->bridge_empty = false; + cfg->priority = 0x7FFF; if ((cur = tb[BRIDGE_ATTR_STP])) cfg->stp = blobmsg_get_bool(cur); @@ -469,8 +575,37 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb) if ((cur = tb[BRIDGE_ATTR_FORWARD_DELAY])) cfg->forward_delay = blobmsg_get_u32(cur); + if ((cur = tb[BRIDGE_ATTR_PRIORITY])) + cfg->priority = blobmsg_get_u32(cur); + if ((cur = tb[BRIDGE_ATTR_IGMP_SNOOP])) - cfg->igmp_snoop = blobmsg_get_bool(cur); + cfg->multicast_querier = cfg->igmp_snoop = blobmsg_get_bool(cur); + + if ((cur = tb[BRIDGE_ATTR_MULTICAST_QUERIER])) + cfg->multicast_querier = blobmsg_get_bool(cur); + + if ((cur = tb[BRIDGE_ATTR_HASH_MAX])) + cfg->hash_max = blobmsg_get_u32(cur); + + if ((cur = tb[BRIDGE_ATTR_ROBUSTNESS])) { + cfg->robustness = blobmsg_get_u32(cur); + cfg->flags |= BRIDGE_OPT_ROBUSTNESS; + } + + if ((cur = tb[BRIDGE_ATTR_QUERY_INTERVAL])) { + cfg->query_interval = blobmsg_get_u32(cur); + cfg->flags |= BRIDGE_OPT_QUERY_INTERVAL; + } + + if ((cur = tb[BRIDGE_ATTR_QUERY_RESPONSE_INTERVAL])) { + cfg->query_response_interval = blobmsg_get_u32(cur); + cfg->flags |= BRIDGE_OPT_QUERY_RESPONSE_INTERVAL; + } + + if ((cur = tb[BRIDGE_ATTR_LAST_MEMBER_INTERVAL])) { + cfg->last_member_interval = blobmsg_get_u32(cur); + cfg->flags |= BRIDGE_OPT_LAST_MEMBER_INTERVAL; + } if ((cur = tb[BRIDGE_ATTR_AGEING_TIME])) { cfg->ageing_time = blobmsg_get_u32(cur); @@ -486,6 +621,9 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb) cfg->max_age = blobmsg_get_u32(cur); cfg->flags |= BRIDGE_OPT_MAX_AGE; } + + if ((cur = tb[BRIDGE_ATTR_BRIDGE_EMPTY])) + cfg->bridge_empty = blobmsg_get_bool(cur); } enum dev_change_type @@ -501,6 +639,7 @@ bridge_reload(struct device *dev, struct blob_attr *attr) BUILD_BUG_ON(sizeof(diff) < __DEV_ATTR_MAX / 8); bst = container_of(dev, struct bridge_state, dev); + attr = blob_memdup(attr); blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, tb_dev, blob_data(attr), blob_len(attr)); @@ -519,25 +658,46 @@ bridge_reload(struct device *dev, struct blob_attr *attr) blob_data(bst->config_data), blob_len(bst->config_data)); diff = 0; - config_diff(tb_dev, otb_dev, &device_attr_list, &diff); - if (diff & ~(1 << DEV_ATTR_IFNAME)) + uci_blob_diff(tb_dev, otb_dev, &device_attr_list, &diff); + if (diff) ret = DEV_CONFIG_RESTART; blobmsg_parse(bridge_attrs, __BRIDGE_ATTR_MAX, otb_br, blob_data(bst->config_data), blob_len(bst->config_data)); diff = 0; - config_diff(tb_br, otb_br, &bridge_attr_list, &diff); + uci_blob_diff(tb_br, otb_br, &bridge_attr_list, &diff); if (diff & ~(1 << BRIDGE_ATTR_IFNAME)) ret = DEV_CONFIG_RESTART; bridge_config_init(dev); } + free(bst->config_data); bst->config_data = attr; return ret; } +static void +bridge_retry_members(struct uloop_timeout *timeout) +{ + struct bridge_state *bst = container_of(timeout, struct bridge_state, retry); + struct bridge_member *bm; + + bst->n_failed = 0; + vlist_for_each_element(&bst->members, bm, node) { + if (bm->present) + continue; + + if (!bm->dev.dev->present) + continue; + + bm->present = true; + bst->n_present++; + bridge_enable_member(bm); + } +} + static struct device * bridge_create(const char *name, struct blob_attr *attr) { @@ -551,6 +711,7 @@ bridge_create(const char *name, struct blob_attr *attr) dev = &bst->dev; device_init(dev, &bridge_device_type, name); dev->config_pending = true; + bst->retry.cb = bridge_retry_members; bst->set_state = dev->set_state; dev->set_state = bridge_set_state; @@ -563,5 +724,3 @@ bridge_create(const char *name, struct blob_attr *attr) return dev; } - -