X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=bridge.c;h=48e1665921878173af60c45f0ab94eb914d97a77;hb=f5f78c1eca1fe2df04dae56a4d9f024533066b29;hp=fe4b477365168dbd4400f7abaa814d29e9191715;hpb=39b97d17479a1767fefdf693bb41141260d9740c;p=project%2Fnetifd.git

diff --git a/bridge.c b/bridge.c
index fe4b477..48e1665 100644
--- a/bridge.c
+++ b/bridge.c
@@ -13,6 +13,7 @@ enum {
 	BRIDGE_ATTR_IFNAME,
 	BRIDGE_ATTR_STP,
 	BRIDGE_ATTR_FORWARD_DELAY,
+	BRIDGE_ATTR_IGMP_SNOOP,
 	BRIDGE_ATTR_AGEING_TIME,
 	BRIDGE_ATTR_HELLO_TIME,
 	BRIDGE_ATTR_MAX_AGE,
@@ -26,6 +27,7 @@ static const struct blobmsg_policy bridge_attrs[__BRIDGE_ATTR_MAX] = {
 	[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 },
 };
 
 static const union config_param_info bridge_attr_info[__BRIDGE_ATTR_MAX] = {
@@ -63,6 +65,7 @@ struct bridge_state {
 	struct bridge_config config;
 	struct blob_attr *ifnames;
 	bool active;
+	bool force_active;
 
 	struct list_head members;
 	int n_present;
@@ -75,6 +78,8 @@ struct bridge_member {
 	bool present;
 };
 
+static void bridge_free_member(struct bridge_member *bm);
+
 static int
 bridge_disable_member(struct bridge_member *bm)
 {
@@ -115,6 +120,24 @@ error:
 }
 
 static void
+bridge_remove_member(struct bridge_member *bm)
+{
+	struct bridge_state *bst = bm->bst;
+
+	if (!bm->present)
+		return;
+
+	bm->present = false;
+	bm->bst->n_present--;
+	if (bst->dev.active)
+		bridge_disable_member(bm);
+
+	bst->force_active = false;
+	if (bst->n_present == 0)
+		device_set_present(&bst->dev, false);
+}
+
+static void
 bridge_member_cb(struct device_user *dev, enum device_event ev)
 {
 	struct bridge_member *bm = container_of(dev, struct bridge_member, dev);
@@ -137,13 +160,10 @@ bridge_member_cb(struct device_user *dev, enum device_event ev)
 		if (!bm->present)
 			return;
 
-		if (bst->dev.active)
-			bridge_disable_member(bm);
-
-		bm->present = false;
-		bm->bst->n_present--;
-		if (bst->n_present == 0)
-			device_set_present(&bst->dev, false);
+		if (dev->hotplug)
+			bridge_free_member(bm);
+		else
+			bridge_remove_member(bm);
 
 		break;
 	default:
@@ -172,7 +192,7 @@ bridge_set_up(struct bridge_state *bst)
 	struct bridge_member *bm;
 	int ret;
 
-	if (!bst->n_present)
+	if (!bst->force_active && !bst->n_present)
 		return -ENOENT;
 
 	ret = system_bridge_addbr(&bst->dev, &bst->config);
@@ -182,7 +202,7 @@ bridge_set_up(struct bridge_state *bst)
 	list_for_each_entry(bm, &bst->members, list)
 		bridge_enable_member(bm);
 
-	if (!bst->n_present) {
+	if (!bst->force_active && !bst->n_present) {
 		/* initialization of all member interfaces failed */
 		system_bridge_delbr(&bst->dev);
 		device_set_present(&bst->dev, false);
@@ -211,19 +231,17 @@ bridge_set_state(struct device *dev, bool up)
 }
 
 static struct bridge_member *
-bridge_create_member(struct bridge_state *bst, struct device *dev)
+bridge_create_member(struct bridge_state *bst, struct device *dev, bool hotplug)
 {
 	struct bridge_member *bm;
 
 	bm = calloc(1, sizeof(*bm));
 	bm->bst = bst;
 	bm->dev.cb = bridge_member_cb;
-	device_add_user(&bm->dev, dev);
-
+	bm->dev.hotplug = hotplug;
 	list_add_tail(&bm->list, &bst->members);
 
-	if (bst->dev.active)
-		bridge_enable_member(bm);
+	device_add_user(&bm->dev, dev);
 
 	return bm;
 }
@@ -231,15 +249,9 @@ bridge_create_member(struct bridge_state *bst, struct device *dev)
 static void
 bridge_free_member(struct bridge_member *bm)
 {
-	if (bm->present) {
-		bridge_member_cb(&bm->dev, DEV_EVENT_REMOVE);
-		bm->bst->n_present--;
-		if (bm->bst->dev.active)
-			bridge_disable_member(bm);
-	}
-
-	list_del(&bm->list);
+	bridge_remove_member(bm);
 	device_remove_user(&bm->dev);
+	list_del(&bm->list);
 	free(bm);
 }
 
@@ -252,7 +264,7 @@ bridge_add_member(struct bridge_state *bst, const char *name)
 	if (!dev)
 		return;
 
-	bridge_create_member(bst, dev);
+	bridge_create_member(bst, dev, false);
 }
 
 static int
@@ -260,7 +272,7 @@ bridge_hotplug_add(struct device *dev, struct device *member)
 {
 	struct bridge_state *bst = container_of(dev, struct bridge_state, dev);
 
-	bridge_create_member(bst, member);
+	bridge_create_member(bst, member, true);
 
 	return 0;
 }
@@ -279,10 +291,23 @@ bridge_hotplug_del(struct device *dev, struct device *member)
 		return 0;
 	}
 
-	return -ENOENT;
+	return UBUS_STATUS_NOT_FOUND;
+}
+
+static int
+bridge_hotplug_prepare(struct device *dev)
+{
+	struct bridge_state *bst;
+
+	bst = container_of(dev, struct bridge_state, dev);
+	bst->force_active = true;
+	device_set_present(&bst->dev, true);
+
+	return 0;
 }
 
 static const struct device_hotplug_ops bridge_ops = {
+	.prepare = bridge_hotplug_prepare,
 	.add = bridge_hotplug_add,
 	.del = bridge_hotplug_del
 };
@@ -311,6 +336,7 @@ bridge_dump_info(struct device *dev, struct blob_buf *b)
 
 	bst = container_of(dev, struct bridge_state, dev);
 
+	system_if_dump_info(dev, b);
 	list = blobmsg_open_array(b, "bridge-members");
 	list_for_each_entry(bm, &bst->members, list) {
 		blobmsg_add_string(b, NULL, bm->dev.dev->ifname);
@@ -326,6 +352,10 @@ bridge_config_init(struct device *dev)
 	int rem;
 
 	bst = container_of(dev, struct bridge_state, dev);
+
+	if (!bst->ifnames)
+		return;
+
 	blobmsg_for_each_attr(cur, bst->ifnames, rem) {
 		bridge_add_member(bst, blobmsg_data(cur));
 	}
@@ -340,6 +370,7 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
 	/* defaults */
 	cfg->stp = true;
 	cfg->forward_delay = 1;
+	cfg->igmp_snoop = true;
 
 	if ((cur = tb[BRIDGE_ATTR_STP]))
 		cfg->stp = blobmsg_get_bool(cur);
@@ -347,6 +378,9 @@ 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_IGMP_SNOOP]))
+		cfg->igmp_snoop = blobmsg_get_bool(cur);
+
 	if ((cur = tb[BRIDGE_ATTR_AGEING_TIME])) {
 		cfg->ageing_time = blobmsg_get_u32(cur);
 		cfg->flags |= BRIDGE_OPT_AGEING_TIME;
@@ -376,9 +410,6 @@ bridge_create(const char *name, struct blob_attr *attr)
 	blobmsg_parse(bridge_attrs, __BRIDGE_ATTR_MAX, tb_br,
 		blob_data(attr), blob_len(attr));
 
-	if (!tb_br[BRIDGE_ATTR_IFNAME])
-		return NULL;
-
 	bst = calloc(1, sizeof(*bst));
 	if (!bst)
 		return NULL;