struct bridge_state *bst;
struct device_user dev;
struct uloop_timeout check_timer;
+ struct device_vlan_range *extra_vlan;
+ int n_extra_vlan;
uint16_t pvid;
bool present;
bool active;
if (bm->pvid == vlan->vid)
flags |= BRVLAN_F_PVID;
- system_bridge_vlan(port->ifname, vlan->vid, add, flags);
+ system_bridge_vlan(port->ifname, vlan->vid, -1, add, flags);
}
static void
if (!vlan->local && add)
return;
- system_bridge_vlan(bst->dev.ifname, vlan->vid, add, BRVLAN_F_SELF);
+ system_bridge_vlan(bst->dev.ifname, vlan->vid, -1, add, BRVLAN_F_SELF);
}
static void
if (bst->has_vlans) {
/* delete default VLAN 1 */
- system_bridge_vlan(bst->dev.ifname, 1, false, BRVLAN_F_SELF);
+ system_bridge_vlan(bst->dev.ifname, 1, -1, false, BRVLAN_F_SELF);
bridge_set_local_vlans(bst, true);
}
bst->active = false;
}
+static void
+bridge_member_add_extra_vlans(struct bridge_member *bm)
+{
+ struct device *dev = bm->dev.dev;
+ int i;
+
+ for (i = 0; i < dev->n_extra_vlan; i++)
+ system_bridge_vlan(dev->ifname, dev->extra_vlan[i].start,
+ dev->extra_vlan[i].end, true, 0);
+ for (i = 0; i < bm->n_extra_vlan; i++)
+ system_bridge_vlan(dev->ifname, bm->extra_vlan[i].start,
+ bm->extra_vlan[i].end, true, 0);
+}
+
static int
bridge_enable_member(struct bridge_member *bm)
{
bm->active = true;
if (bst->has_vlans) {
/* delete default VLAN 1 */
- system_bridge_vlan(bm->dev.dev->ifname, 1, false, 0);
+ system_bridge_vlan(bm->dev.dev->ifname, 1, -1, false, 0);
+ bridge_member_add_extra_vlans(bm);
vlist_for_each_element(&bst->dev.vlans, vlan, node)
bridge_set_member_vlan(bm, vlan, true);
}
goto restart;
}
- device_lock();
-
device_remove_user(&bm->dev);
uloop_timeout_cancel(&bm->check_timer);
device_set_present(dev, true);
}
- device_unlock();
-
free(bm);
}
}
static struct bridge_member *
-bridge_create_member(struct bridge_state *bst, const char *name,
- struct device *dev, bool hotplug)
+bridge_alloc_member(struct bridge_state *bst, const char *name,
+ struct device *dev, bool hotplug)
{
struct bridge_member *bm;
bm->check_timer.cb = bridge_member_check_cb;
strcpy(bm->name, name);
bm->dev.dev = dev;
+
+ return bm;
+}
+
+static void bridge_insert_member(struct bridge_member *bm, const char *name)
+{
+ struct bridge_state *bst = bm->bst;
+ bool hotplug = bm->dev.hotplug;
+
vlist_add(&bst->members, &bm->node, bm->name);
/*
* Need to look up the bridge member again as the above
bm = vlist_find(&bst->members, name, bm, node);
if (hotplug && bm)
bm->node.version = -1;
+}
- return bm;
+static void
+bridge_create_member(struct bridge_state *bst, const char *name,
+ struct device *dev, bool hotplug)
+{
+ struct bridge_member *bm;
+
+ bm = bridge_alloc_member(bst, name, dev, hotplug);
+ if (bm)
+ bridge_insert_member(bm, name);
}
static void
}
static struct bridge_vlan *
-bridge_hotplug_get_vlan(struct bridge_state *bst, uint16_t vid)
+bridge_hotplug_get_vlan(struct bridge_state *bst, uint16_t vid, bool create)
{
struct bridge_vlan *vlan;
vlan = vlist_find(&bst->dev.vlans, &vid, vlan, node);
- if (vlan)
+ if (vlan || !create)
return vlan;
vlan = calloc(1, sizeof(*vlan));
bridge_hotplug_set_member_vlans(struct bridge_state *bst, struct blob_attr *vlans,
const char *ifname, struct bridge_member *bm, bool add)
{
+ struct device_vlan_range *r;
struct bridge_vlan *vlan;
struct blob_attr *cur;
- int rem;
+ int n_vlans;
+ size_t rem;
if (!vlans)
return;
+ if (add) {
+ bm->n_extra_vlan = 0;
+ n_vlans = blobmsg_check_array(vlans, BLOBMSG_TYPE_STRING);
+ if (n_vlans < 1)
+ return;
+
+ bm->extra_vlan = realloc(bm->extra_vlan, n_vlans * sizeof(*bm->extra_vlan));
+ }
+
blobmsg_for_each_attr(cur, vlans, rem) {
struct bridge_vlan_hotplug_port *port;
- uint16_t flags = BRVLAN_F_UNTAGGED;
+ unsigned int vid, vid_end;
+ uint16_t flags = 0;
char *name_buf;
- unsigned int vid;
char *end;
if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
continue;
vid = strtoul(blobmsg_get_string(cur), &end, 0);
+ vid_end = vid;
if (!vid || vid > 4095)
continue;
- vlan = bridge_hotplug_get_vlan(bst, vid);
- if (!vlan)
- continue;
-
- if (vlan->pending) {
- vlan->pending = false;
- bridge_set_vlan_state(bst, vlan, true);
+ if (*end == '-') {
+ vid_end = strtoul(end + 1, &end, 0);
+ if (vid_end < vid)
+ continue;
}
if (end && *end) {
for (end++; *end; end++) {
switch (*end) {
- case 't':
- flags &= ~BRVLAN_F_UNTAGGED;
+ case 'u':
+ flags |= BRVLAN_F_UNTAGGED;
break;
case '*':
flags |= BRVLAN_F_PVID;
}
}
+ vlan = bridge_hotplug_get_vlan(bst, vid, !!flags);
+ if (!vlan || vid_end > vid) {
+ if (add) {
+ r = &bm->extra_vlan[bm->n_extra_vlan++];
+ r->start = vid;
+ r->end = vid_end;
+ if (bm->active)
+ system_bridge_vlan(ifname, vid, vid_end, true, 0);
+ } else if (bm->active) {
+ system_bridge_vlan(ifname, vid, vid_end, false, 0);
+ }
+ continue;
+ }
+
+ if (vlan->pending) {
+ vlan->pending = false;
+ bridge_set_vlan_state(bst, vlan, true);
+ }
+
port = bridge_hotplug_get_vlan_port(vlan, ifname);
if (!add) {
if (!port)
{
struct bridge_state *bst = container_of(dev, struct bridge_state, dev);
struct bridge_member *bm;
+ bool new_entry = false;
bm = vlist_find(&bst->members, member->ifname, bm, node);
+ if (!bm) {
+ new_entry = true;
+ bm = bridge_alloc_member(bst, member->ifname, member, true);
+ }
bridge_hotplug_set_member_vlans(bst, vlan, member->ifname, bm, true);
- if (!bm)
- bridge_create_member(bst, member->ifname, member, true);
+ if (new_entry)
+ bridge_insert_member(bm, member->ifname);
return 0;
}
bool tagged = !(port->flags & BRVLAN_F_UNTAGGED);
bool pvid = (port->flags & BRVLAN_F_PVID);
- blobmsg_printf(b, "%s%s%s%s\n", port->ifname,
+ blobmsg_printf(b, NULL, "%s%s%s%s", port->ifname,
tagged || pvid ? ":" : "",
tagged ? "t" : "",
pvid ? "*" : "");
static void
bridge_dump_info(struct device *dev, struct blob_buf *b)
{
+ struct bridge_config *cfg;
struct bridge_state *bst;
struct bridge_member *bm;
struct bridge_vlan *vlan;
void *list;
+ void *c;
bst = container_of(dev, struct bridge_state, dev);
+ cfg = &bst->config;
system_if_dump_info(dev, b);
list = blobmsg_open_array(b, "bridge-members");
blobmsg_close_array(b, list);
+ c = blobmsg_open_table(b, "bridge-attributes");
+
+ blobmsg_add_u8(b, "stp", cfg->stp);
+ blobmsg_add_u32(b, "forward_delay", cfg->forward_delay);
+ blobmsg_add_u32(b, "priority", cfg->priority);
+ blobmsg_add_u32(b, "ageing_time", cfg->ageing_time);
+ blobmsg_add_u32(b, "hello_time", cfg->hello_time);
+ blobmsg_add_u32(b, "max_age", cfg->max_age);
+ blobmsg_add_u8(b, "igmp_snooping", cfg->igmp_snoop);
+ blobmsg_add_u8(b, "bridge_empty", cfg->bridge_empty);
+ blobmsg_add_u8(b, "multicast_querier", cfg->multicast_querier);
+ blobmsg_add_u32(b, "hash_max", cfg->hash_max);
+ blobmsg_add_u32(b, "robustness", cfg->robustness);
+ blobmsg_add_u32(b, "query_interval", cfg->query_interval);
+ blobmsg_add_u32(b, "query_response_interval", cfg->query_response_interval);
+ blobmsg_add_u32(b, "last_member_interval", cfg->last_member_interval);
+ blobmsg_add_u8(b, "vlan_filtering", cfg->vlan_filtering);
+ blobmsg_add_u8(b, "stp_kernel", cfg->stp_kernel);
+ if (cfg->stp_proto)
+ blobmsg_add_string(b, "stp_proto", cfg->stp_proto);
+
+ blobmsg_close_table(b, c);
+
if (avl_is_empty(&dev->vlans.avl))
return;
struct bridge_state *bst;
struct bridge_vlan *vlan;
struct blob_attr *cur;
- int i, rem;
+ size_t rem;
+ int i;
bst = container_of(dev, struct bridge_state, dev);
diff = 0;
uci_blob_diff(tb_dev, otb_dev, &device_attr_list, &diff);
- if (diff)
- ret = DEV_CONFIG_RESTART;
+ if (diff) {
+ ret = DEV_CONFIG_RESTART;
+ D(DEVICE, "Bridge %s device attributes have changed, diff=0x%lx\n",
+ dev->ifname, diff);
+ }
blobmsg_parse(bridge_attrs, __BRIDGE_ATTR_MAX, otb_br,
blob_data(bst->config_data), blob_len(bst->config_data));
diff = 0;
uci_blob_diff(tb_br, otb_br, &bridge_attr_list, &diff);
- if (diff & ~(1 << BRIDGE_ATTR_PORTS))
- ret = DEV_CONFIG_RESTART;
+ if (diff & ~(1 << BRIDGE_ATTR_PORTS)) {
+ ret = DEV_CONFIG_RESTART;
+ D(DEVICE, "Bridge %s attributes have changed, diff=0x%lx\n",
+ dev->ifname, diff);
+ }
bridge_config_init(dev);
}
projects / project / netifd.git / blobdiff