X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=wireless.c;h=ffb9e38c6666885fa1c558846c7f51d3f5138a1c;hp=3c785f68c22cd532931e63c292700d95019c0380;hb=36359529c2976d5788c914e30234e2a503b01049;hpb=b9065a028d2120ee59debd784552d628133a6f31

diff --git a/wireless.c b/wireless.c
index 3c785f6..ffb9e38 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,23 +57,33 @@ 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);
 
-	dev = iface->main_dev.dev;
-	if (!dev)
-		return;
+		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;
+	}
 
-	if (dev->type != &bridge_device_type)
+	if (!dev)
 		return;
 
 	if (dev->hotplug_ops && dev->hotplug_ops->prepare)
@@ -170,6 +180,7 @@ wireless_device_free_state(struct wireless_device *wdev)
 {
 	struct wireless_interface *vif;
 
+	uloop_timeout_cancel(&wdev->script_check);
 	uloop_timeout_cancel(&wdev->timeout);
 	wireless_complete_kill_request(wdev);
 	free(wdev->data);
@@ -184,15 +195,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);
+
+		iface = vlist_find(&interfaces, network, iface, node);
+		if (!iface)
+			continue;
 
-	interface_handle_link(iface, vif->ifname, up);
+		interface_handle_link(iface, vif->ifname, up);
+	}
 }
 
 static void
@@ -243,6 +261,9 @@ wireless_device_run_handler(struct wireless_device *wdev, bool up)
 static void
 __wireless_device_set_up(struct wireless_device *wdev)
 {
+	if (wdev->disabled)
+		return;
+
 	if (wdev->state != IFS_DOWN || config_init)
 		return;
 
@@ -253,9 +274,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
@@ -263,10 +285,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;
@@ -377,12 +399,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
@@ -393,15 +413,17 @@ static void
 wdev_change_config(struct wireless_device *wdev, struct wireless_device *wd_new)
 {
 	struct blob_attr *new_config = wd_new->config;
+	bool disabled = wd_new->disabled;
 
 	free(wd_new);
 
-	if (blob_attr_equal(wdev->config, new_config))
+	if (blob_attr_equal(wdev->config, new_config) && wdev->disabled == disabled)
 		return;
 
 	D(WIRELESS, "Update configuration of wireless device '%s'\n", wdev->name);
 	free(wdev->config);
 	wdev->config = blob_memdup(new_config);
+	wdev->disabled = disabled;
 	wdev_set_config_state(wdev, IFC_RELOAD);
 }
 
@@ -445,10 +467,10 @@ wireless_add_handler(const char *script, const char *name, json_object *obj)
 		return;
 
 	drv = calloc_a(sizeof(*drv),
-		&name_str, strlen(name) + 1,
-		&script_str, strlen(script) + 1,
 		&dev_config, sizeof(*dev_config) + sizeof(void *),
-		&iface_config, sizeof(*iface_config) + sizeof(void *));
+		&iface_config, sizeof(*iface_config) + sizeof(void *),
+		&name_str, strlen(name) + 1,
+		&script_str, strlen(script) + 1);
 
 	drv->name = strcpy(name_str, name);
 	drv->script = strcpy(script_str, script);
@@ -469,8 +491,7 @@ wireless_add_handler(const char *script, const char *name, json_object *obj)
 	D(WIRELESS, "Add handler for script %s: %s\n", script, name);
 }
 
-static void __init
-wireless_init_list(void)
+void wireless_init(void)
 {
 	vlist_init(&wireless_devices, avl_strcmp, wdev_update);
 	wireless_devices.keep_old = true;
@@ -494,7 +515,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
@@ -594,10 +615,10 @@ wireless_device_create(struct wireless_driver *drv, const char *name, struct blo
 	struct blob_attr *disabled;
 
 	blobmsg_parse(&wdev_policy, 1, &disabled, blob_data(data), blob_len(data));
-	if (disabled && blobmsg_get_bool(disabled))
-		return;
 
 	wdev = calloc_a(sizeof(*wdev), &name_buf, strlen(name) + 1);
+	if (disabled && blobmsg_get_bool(disabled))
+		wdev->disabled = true;
 	wdev->drv = drv;
 	wdev->state = IFS_DOWN;
 	wdev->config_state = IFC_NORMAL;
@@ -608,7 +629,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;
@@ -651,7 +671,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)
@@ -671,10 +691,36 @@ 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");
+	blobmsg_add_u8(b, "disabled", wdev->disabled);
+
+	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);
+}
+
+void
+wireless_device_get_validate(struct wireless_device *wdev, struct blob_buf *b)
+{
+	struct uci_blob_param_list *p;
+	void *c, *d;
+	int i;
+
+	c = blobmsg_open_table(b, wdev->name);
+
+	d = blobmsg_open_table(b, "device");
+	p = wdev->drv->device.config;
+	for (i = 0; i < p->n_params; i++)
+		blobmsg_add_string(b, p->params[i].name, uci_get_validate_string(p, i));
+	blobmsg_close_table(b, d);
+
+	d = blobmsg_open_table(b, "interface");
+	p = wdev->drv->interface.config;
+	for (i = 0; i < p->n_params; i++)
+		blobmsg_add_string(b, p->params[i].name, uci_get_validate_string(p, i));
+	blobmsg_close_table(b, d);
+
 	blobmsg_close_table(b, c);
 }