X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=wireless.c;h=6201da7cfcb78c6dbba51b88c91d6320b2f08de9;hb=121d90a6faa4a689a593eadb738e537a5768534d;hp=fb66e7f3b136384abb1825f5b6d58d399687f308;hpb=557c36d169c82e025c633a1f3ef935df40d10784;p=project%2Fnetifd.git

diff --git a/wireless.c b/wireless.c
index fb66e7f..6201da7 100644
--- a/wireless.c
+++ b/wireless.c
@@ -40,7 +40,7 @@ enum {
 
 static const struct blobmsg_policy vif_policy[__VIF_ATTR_MAX] = {
 	[VIF_ATTR_DISABLED] = { .name = "disabled", .type = BLOBMSG_TYPE_BOOL },
-	[VIF_ATTR_NETWORK] = { .name = "network", .type = BLOBMSG_TYPE_STRING },
+	[VIF_ATTR_NETWORK] = { .name = "network", .type = BLOBMSG_TYPE_ARRAY },
 };
 
 static const struct uci_blob_param_list vif_param = {
@@ -57,24 +57,37 @@ put_container(struct blob_buf *buf, struct blob_attr *attr, const char *name)
 }
 
 static void
-vif_config_add_bridge(struct blob_buf *buf, const char *network, bool prepare)
+vif_config_add_bridge(struct blob_buf *buf, struct blob_attr *networks, bool prepare)
 {
 	struct interface *iface;
-	struct device *dev;
+	struct device *dev = NULL;
+	struct blob_attr *cur;
+	const char *network;
+	int rem;
 
-	if (!network)
+	if (!networks)
 		return;
 
-	iface = vlist_find(&interfaces, network, iface, node);
-	if (!iface)
-		return;
+	blobmsg_for_each_attr(cur, networks, rem) {
+		network = blobmsg_data(cur);
+
+		iface = vlist_find(&interfaces, network, iface, node);
+		if (!iface)
+			continue;
+
+		dev = iface->main_dev.dev;
+		if (!dev)
+			return;
+
+		if (dev->type != &bridge_device_type)
+			return;
+	}
 
-	dev = iface->main_dev.dev;
 	if (!dev)
 		return;
 
-	if (dev->type != &bridge_device_type)
-		return;
+	if (dev->hotplug_ops && dev->hotplug_ops->prepare)
+		dev->hotplug_ops->prepare(dev);
 
 	blobmsg_add_string(buf, "bridge", dev->ifname);
 }
@@ -181,15 +194,22 @@ wireless_device_free_state(struct wireless_device *wdev)
 static void wireless_interface_handle_link(struct wireless_interface *vif, bool up)
 {
 	struct interface *iface;
+	struct blob_attr *cur;
+	const char *network;
+	int rem;
 
 	if (!vif->network || !vif->ifname)
 		return;
 
-	iface = vlist_find(&interfaces, vif->network, iface, node);
-	if (!iface)
-		return;
+	blobmsg_for_each_attr(cur, vif->network, rem) {
+		network = blobmsg_data(cur);
 
-	interface_handle_link(iface, vif->ifname, up);
+		iface = vlist_find(&interfaces, network, iface, node);
+		if (!iface)
+			continue;
+
+		interface_handle_link(iface, vif->ifname, up);
+	}
 }
 
 static void
@@ -250,9 +270,10 @@ __wireless_device_set_up(struct wireless_device *wdev)
 static void
 wireless_device_free(struct wireless_device *wdev)
 {
-    vlist_flush_all(&wdev->interfaces);
-    free(wdev->config);
-    free(wdev);
+	vlist_flush_all(&wdev->interfaces);
+	avl_delete(&wireless_devices.avl, &wdev->node.avl);
+	free(wdev->config);
+	free(wdev);
 }
 
 static void
@@ -260,10 +281,10 @@ wdev_handle_config_change(struct wireless_device *wdev)
 {
 	enum interface_config_state state = wdev->config_state;
 
-	wdev->config_state = IFC_NORMAL;
 	switch(state) {
 	case IFC_NORMAL:
 	case IFC_RELOAD:
+		wdev->config_state = IFC_NORMAL;
 		if (wdev->autostart)
 			__wireless_device_set_up(wdev);
 		break;
@@ -338,6 +359,9 @@ __wireless_device_set_down(struct wireless_device *wdev)
 static void
 wireless_device_retry_setup(struct wireless_device *wdev)
 {
+	if (wdev->state == IFS_TEARDOWN || wdev->state == IFS_DOWN || wdev->cancel)
+		return;
+
 	if (--wdev->retry < 0)
 		wdev->autostart = false;
 
@@ -371,12 +395,10 @@ wireless_device_set_down(struct wireless_device *wdev)
 static void
 wdev_set_config_state(struct wireless_device *wdev, enum interface_config_state s)
 {
-	enum interface_config_state old_state = wdev->config_state;
-
-	wdev->config_state = s;
-	if (old_state != IFC_NORMAL)
+	if (wdev->config_state != IFC_NORMAL)
 		return;
 
+	wdev->config_state = s;
 	if (wdev->state == IFS_DOWN)
 		wdev_handle_config_change(wdev);
 	else
@@ -488,7 +510,7 @@ wireless_interface_init_config(struct wireless_interface *vif)
 	blobmsg_parse(vif_policy, __VIF_ATTR_MAX, tb, blob_data(vif->config), blob_len(vif->config));
 
 	if ((cur = tb[VIF_ATTR_NETWORK]))
-		vif->network = blobmsg_data(cur);
+		vif->network = cur;
 }
 
 static void
@@ -602,7 +624,6 @@ wireless_device_create(struct wireless_driver *drv, const char *name, struct blo
 	INIT_LIST_HEAD(&wdev->script_proc);
 	vlist_init(&wdev->interfaces, avl_strcmp, vif_update);
 	wdev->interfaces.keep_old = true;
-	wdev->interfaces.no_delete = true;
 	vlist_add(&wireless_devices, &wdev->node, wdev->name);
 
 	wdev->timeout.cb = wireless_device_setup_timeout;
@@ -645,7 +666,7 @@ wireless_interface_status(struct wireless_interface *iface, struct blob_buf *b)
 {
 	void *i;
 
-	i = blobmsg_open_table(b, iface->name);
+	i = blobmsg_open_table(b, NULL);
 	if (iface->section)
 		blobmsg_add_string(b, "section", iface->section);
 	if (iface->ifname)
@@ -665,10 +686,10 @@ wireless_device_status(struct wireless_device *wdev, struct blob_buf *b)
 	blobmsg_add_u8(b, "up", wdev->state == IFS_UP);
 	blobmsg_add_u8(b, "pending", wdev->state == IFS_SETUP || wdev->state == IFS_TEARDOWN);
 	blobmsg_add_u8(b, "autostart", wdev->autostart);
-	i = blobmsg_open_table(b, "interfaces");
+	i = blobmsg_open_array(b, "interfaces");
 	vlist_for_each_element(&wdev->interfaces, iface, node)
 		wireless_interface_status(iface, b);
-	blobmsg_close_table(b, i);
+	blobmsg_close_array(b, i);
 	blobmsg_close_table(b, c);
 }