X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=bridge.c;h=f8478ad698a9f0609c4a08ff7be14063113594d9;hp=01c9a2c2c0bb1cd49d9c40dc0af4d7c00b433bcb;hb=cc8c69f2533e3c85e3631f1371a4207c2d5becce;hpb=814e09499e12edaea658f9f5594fe9917c0ecde4

diff --git a/bridge.c b/bridge.c
index 01c9a2c..f8478ad 100644
--- a/bridge.c
+++ b/bridge.c
@@ -88,9 +88,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 {
@@ -140,10 +142,38 @@ 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)
 {
 	struct bridge_state *bst = bm->bst;
@@ -152,6 +182,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;
@@ -162,11 +202,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;
 }
 
@@ -178,7 +224,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)
@@ -219,6 +265,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);
@@ -231,10 +286,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);
+		}
 
 		break;
 	case DEV_EVENT_REMOVE:
@@ -262,7 +324,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;
 }
@@ -273,19 +335,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;
 	}
@@ -295,7 +361,6 @@ bridge_set_up(struct bridge_state *bst)
 	if (ret < 0)
 		bridge_set_down(bst);
 
-out:
 	return ret;
 }
 
@@ -318,13 +383,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;
@@ -454,6 +526,7 @@ bridge_config_init(struct device *dev)
 		device_set_present(&bst->dev, true);
 	}
 
+	bst->n_failed = 0;
 	vlist_update(&bst->members);
 	if (bst->ifnames) {
 		blobmsg_for_each_attr(cur, bst->ifnames, rem) {
@@ -461,6 +534,7 @@ bridge_config_init(struct device *dev)
 		}
 	}
 	vlist_flush(&bst->members);
+	bridge_check_retry(bst);
 }
 
 static void
@@ -472,7 +546,7 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
 	/* defaults */
 	cfg->stp = false;
 	cfg->forward_delay = 2;
-	cfg->igmp_snoop = false;
+	cfg->igmp_snoop = true;
 	cfg->bridge_empty = false;
 	cfg->priority = 0x7FFF;
 
@@ -557,6 +631,26 @@ bridge_reload(struct device *dev, struct blob_attr *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)
 {
@@ -570,6 +664,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;