X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=5d3db9f0bec329517d03b4017279ef17e0e83e3a;hp=9fb9c010d8bceac8487881e1ef2253ef04f3c258;hb=61e5fa84eca4176bc5b4f9769a5af79d85cf11c6;hpb=d620bdae7081eafce2a4b3e6da0aa2116d71fbc8

diff --git a/config.c b/config.c
index 9fb9c01..5d3db9f 100644
--- a/config.c
+++ b/config.c
@@ -11,6 +11,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -77,7 +78,6 @@ config_parse_interface(struct uci_section *s, bool alias)
 	struct interface *iface;
 	const char *type = NULL, *disabled;
 	struct blob_attr *config;
-	struct device *dev;
 	bool bridge = false;
 
 	disabled = uci_lookup_option_string(uci_ctx, s, "disabled");
@@ -117,26 +117,8 @@ config_parse_interface(struct uci_section *s, bool alias)
 	} else {
 		interface_add(iface, config);
 	}
-
-	/*
-	 * need to look up the interface name again, in case of config update,
-	 * the pointer will have changed
-	 */
-	iface = vlist_find(&interfaces, s->e.name, iface, node);
-	if (!iface)
-		return;
-
-	dev = iface->main_dev.dev;
-	if (!dev || !dev->default_config)
-		return;
-
-	blob_buf_init(&b, 0);
-	uci_to_blob(&b, s, dev->type->config_params);
-	if (blob_len(b.head) == 0)
-		return;
-
-	device_set_config(dev, dev->type, b.head);
 	return;
+
 error_free_config:
 	free(config);
 error:
@@ -173,8 +155,10 @@ config_init_devices(void)
 	struct uci_element *e;
 
 	uci_foreach_element(&uci_network->sections, e) {
+		const struct uci_blob_param_list *params = NULL;
 		struct uci_section *s = uci_to_section(e);
 		const struct device_type *devtype = NULL;
+		struct device *dev;
 		const char *type, *name;
 
 		if (strcmp(s->type, "device") != 0)
@@ -198,12 +182,26 @@ config_init_devices(void)
 				devtype = &tunnel_device_type;
 		}
 
-		if (!devtype)
-			devtype = &simple_device_type;
+		if (devtype)
+			params = devtype->config_params;
+		if (!params)
+			params = simple_device_type.config_params;
 
 		blob_buf_init(&b, 0);
-		uci_to_blob(&b, s, devtype->config_params);
-		device_create(name, devtype, b.head);
+		uci_to_blob(&b, s, params);
+		if (devtype) {
+			dev = device_create(name, devtype, b.head);
+			if (!dev)
+				continue;
+		} else {
+			dev = device_get(name, 1);
+			if (!dev)
+				continue;
+
+			dev->current_config = true;
+			device_apply_config(dev, dev->type, b.head);
+		}
+		dev->default_config = false;
 	}
 }
 
@@ -308,6 +306,12 @@ config_init_globals(void)
 	const char *ula_prefix = uci_lookup_option_string(
 			uci_ctx, globals, "ula_prefix");
 	interface_ip_set_ula_prefix(ula_prefix);
+
+	const char *default_ps = uci_lookup_option_string(
+			uci_ctx, globals, "default_ps");
+
+	if (default_ps)
+		device_set_default_ps(strcmp(default_ps, "1") ? false : true);
 }
 
 static void
@@ -332,16 +336,14 @@ config_parse_wireless_device(struct uci_section *s)
 static void
 config_parse_wireless_interface(struct wireless_device *wdev, struct uci_section *s)
 {
-	char *name = NULL;
+	char *name;
 
-	if (s->anonymous) {
-		name = alloca(strlen(s->type) + 16);
-		asprintf(&name, "@%s[%d]", s->type, config_section_idx(s));
-	}
+	name = alloca(strlen(s->type) + 16);
+	sprintf(name, "@%s[%d]", s->type, config_section_idx(s));
 
 	blob_buf_init(&b, 0);
 	uci_to_blob(&b, s, wdev->drv->interface.config);
-	wireless_interface_create(wdev, b.head, name ? name : s->e.name);
+	wireless_interface_create(wdev, b.head, s->anonymous ? name : s->e.name);
 }
 
 static void