X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=bridge.c;h=da07d9c855214dbf89e6a2c65e62df7e8d4734d5;hp=f2c73b0108b74e9d6f459fe992920f520a62cf30;hb=b32cffd4f0a2b904a1e3c38e5141100970f89a65;hpb=e8ae4f0fb1470af28fe10fb6dbcd27ce97ea7f03

diff --git a/bridge.c b/bridge.c
index f2c73b0..da07d9c 100644
--- a/bridge.c
+++ b/bridge.c
@@ -47,6 +47,8 @@ static struct device *bridge_create(const char *name, struct blob_attr *attr);
 static void bridge_config_init(struct device *dev);
 static void bridge_free(struct device *dev);
 static void bridge_dump_info(struct device *dev, struct blob_buf *b);
+enum dev_change_type
+bridge_reload(struct device *dev, struct blob_attr *attr);
 
 const struct device_type bridge_device_type = {
 	.name = "Bridge",
@@ -54,6 +56,7 @@ const struct device_type bridge_device_type = {
 
 	.create = bridge_create,
 	.config_init = bridge_config_init,
+	.reload = bridge_reload,
 	.free = bridge_free,
 	.dump_info = bridge_dump_info,
 };
@@ -62,6 +65,7 @@ struct bridge_state {
 	struct device dev;
 	device_state_cb set_state;
 
+	struct blob_attr *config_data;
 	struct bridge_config config;
 	struct blob_attr *ifnames;
 	bool active;
@@ -107,8 +111,10 @@ bridge_enable_member(struct bridge_member *bm)
 		goto error;
 
 	ret = system_bridge_addif(&bst->dev, bm->dev.dev);
-	if (ret < 0)
+	if (ret < 0) {
+		D(DEVICE, "Bridge device %s could not be added\n", bm->dev.dev->ifname);
 		goto error;
+	}
 
 	return 0;
 
@@ -126,11 +132,12 @@ bridge_remove_member(struct bridge_member *bm)
 	if (!bm->present)
 		return;
 
-	bm->present = false;
-	bm->bst->n_present--;
 	if (bst->dev.active)
 		bridge_disable_member(bm);
 
+	bm->present = false;
+	bm->bst->n_present--;
+
 	bst->force_active = false;
 	if (bst->n_present == 0)
 		device_set_present(&bst->dev, false);
@@ -156,12 +163,12 @@ bridge_member_cb(struct device_user *dev, enum device_event ev)
 
 		break;
 	case DEV_EVENT_REMOVE:
-		if (!bm->present)
+		if (dev->hotplug) {
+			vlist_delete(&bst->members, &bm->node);
 			return;
+		}
 
-		if (dev->hotplug)
-			vlist_delete(&bst->members, &bm->node);
-		else
+		if (bm->present)
 			bridge_remove_member(bm);
 
 		break;
@@ -241,6 +248,8 @@ bridge_create_member(struct bridge_state *bst, struct device *dev, bool hotplug)
 	strcpy(bm->name, dev->ifname);
 	bm->dev.dev = dev;
 	vlist_add(&bst->members, &bm->node, bm->name);
+	if (hotplug)
+		bm->node.version = -1;
 
 	return bm;
 }
@@ -334,7 +343,6 @@ bridge_free(struct device *dev)
 {
 	struct bridge_state *bst;
 
-	device_cleanup(dev);
 	bst = container_of(dev, struct bridge_state, dev);
 	vlist_flush_all(&bst->members);
 	free(bst);
@@ -370,9 +378,11 @@ bridge_config_init(struct device *dev)
 	if (!bst->ifnames)
 		return;
 
+	vlist_update(&bst->members);
 	blobmsg_for_each_attr(cur, bst->ifnames, rem) {
 		bridge_add_member(bst, blobmsg_data(cur));
 	}
+	vlist_flush(&bst->members);
 }
 
 static void
@@ -382,8 +392,8 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
 	struct blob_attr *cur;
 
 	/* defaults */
-	cfg->stp = true;
-	cfg->forward_delay = 1;
+	cfg->stp = false;
+	cfg->forward_delay = 2;
 	cfg->igmp_snoop = true;
 
 	if ((cur = tb[BRIDGE_ATTR_STP]))
@@ -411,29 +421,69 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
 	}
 }
 
-static struct device *
-bridge_create(const char *name, struct blob_attr *attr)
+enum dev_change_type
+bridge_reload(struct device *dev, struct blob_attr *attr)
 {
 	struct blob_attr *tb_dev[__DEV_ATTR_MAX];
 	struct blob_attr *tb_br[__BRIDGE_ATTR_MAX];
+	enum dev_change_type ret = DEV_CONFIG_APPLIED;
+	unsigned long diff;
 	struct bridge_state *bst;
-	struct device *dev = NULL;
+
+	BUILD_BUG_ON(sizeof(diff) < __BRIDGE_ATTR_MAX / 8);
+	BUILD_BUG_ON(sizeof(diff) < __DEV_ATTR_MAX / 8);
+
+	bst = container_of(dev, struct bridge_state, dev);
 
 	blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, tb_dev,
 		blob_data(attr), blob_len(attr));
 	blobmsg_parse(bridge_attrs, __BRIDGE_ATTR_MAX, tb_br,
 		blob_data(attr), blob_len(attr));
 
+	bst->ifnames = tb_br[BRIDGE_ATTR_IFNAME];
+	device_init_settings(dev, tb_dev);
+	bridge_apply_settings(bst, tb_br);
+
+	if (bst->config_data) {
+		struct blob_attr *otb_dev[__DEV_ATTR_MAX];
+		struct blob_attr *otb_br[__BRIDGE_ATTR_MAX];
+
+		blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, otb_dev,
+			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))
+		    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);
+		if (diff & ~(1 << BRIDGE_ATTR_IFNAME))
+		    ret = DEV_CONFIG_RESTART;
+
+		bridge_config_init(dev);
+	}
+
+	bst->config_data = attr;
+	return ret;
+}
+
+static struct device *
+bridge_create(const char *name, struct blob_attr *attr)
+{
+	struct bridge_state *bst;
+	struct device *dev = NULL;
+
 	bst = calloc(1, sizeof(*bst));
 	if (!bst)
 		return NULL;
 
 	dev = &bst->dev;
 	device_init(dev, &bridge_device_type, name);
-	device_init_settings(dev, tb_dev);
 	dev->config_pending = true;
-	bst->ifnames = tb_br[BRIDGE_ATTR_IFNAME];
-	bridge_apply_settings(bst, tb_br);
 
 	bst->set_state = dev->set_state;
 	dev->set_state = bridge_set_state;
@@ -442,6 +492,7 @@ bridge_create(const char *name, struct blob_attr *attr)
 
 	vlist_init(&bst->members, avl_strcmp, bridge_member_update);
 	bst->members.keep_old = true;
+	bridge_reload(dev, attr);
 
 	return dev;
 }