X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=0d965d33bd714a6a00882ecac6be95384e6b852b;hp=34d2f2b9cd26056d9ec06ea02536b74b05843040;hb=a03216660797173fbe67866f75564e3fec9c1e8d;hpb=258b79f7a912abc84a3066c90266d8835597362e

diff --git a/config.c b/config.c
index 34d2f2b..0d965d3 100644
--- a/config.c
+++ b/config.c
@@ -53,18 +53,18 @@ config_section_idx(struct uci_section *s)
 }
 
 static int
-config_parse_bridge_interface(struct uci_section *s)
+config_parse_bridge_interface(struct uci_section *s, struct device_type *devtype)
 {
 	char *name;
 
-	name = alloca(strlen(s->e.name) + 4);
-	sprintf(name, "br-%s", s->e.name);
+	name = alloca(strlen(s->e.name) + strlen(devtype->name_prefix) + 2);
+	sprintf(name, "%s-%s", devtype->name_prefix, s->e.name);
 	blobmsg_add_string(&b, "name", name);
 
-	uci_to_blob(&b, s, bridge_device_type.config_params);
-	if (!device_create(name, &bridge_device_type, b.head)) {
-		D(INTERFACE, "Failed to create bridge for interface '%s'\n", s->e.name);
-		return -EINVAL;
+	uci_to_blob(&b, s, devtype->config_params);
+	if (!device_create(name, devtype, b.head)) {
+		D(INTERFACE, "Failed to create '%s' device for interface '%s'\n",
+			devtype->name, s->e.name);
 	}
 
 	blob_buf_init(&b, 0);
@@ -78,8 +78,8 @@ 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;
+	struct device_type *devtype = NULL;
 
 	disabled = uci_lookup_option_string(uci_ctx, s, "disabled");
 	if (disabled && !strcmp(disabled, "1"))
@@ -89,8 +89,12 @@ config_parse_interface(struct uci_section *s, bool alias)
 
 	if (!alias)
 		type = uci_lookup_option_string(uci_ctx, s, "type");
-	if (type && !strcmp(type, "bridge")) {
-		if (config_parse_bridge_interface(s))
+
+	if (type)
+		devtype = device_type_get(type);
+
+	if (devtype && devtype->bridge_capability) {
+		if (config_parse_bridge_interface(s, devtype))
 			return;
 
 		bridge = true;
@@ -105,7 +109,7 @@ config_parse_interface(struct uci_section *s, bool alias)
 	if (iface->proto_handler && iface->proto_handler->config_params)
 		uci_to_blob(&b, s, iface->proto_handler->config_params);
 
-	if (!bridge && uci_to_blob(&b, s, simple_device_type.config_params) > 1)
+	if (!bridge && uci_to_blob(&b, s, simple_device_type.config_params))
 		iface->device_config = true;
 
 	config = blob_memdup(b.head);
@@ -118,27 +122,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;
-
-	if (iface->device_config)
-		device_set_config(dev, dev->type, b.head);
 	return;
+
 error_free_config:
 	free(config);
 error:
@@ -177,7 +162,7 @@ config_init_devices(void)
 	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_type *devtype = NULL;
 		struct device *dev;
 		const char *type, *name;
 
@@ -189,18 +174,8 @@ config_init_devices(void)
 			continue;
 
 		type = uci_lookup_option_string(uci_ctx, s, "type");
-		if (type) {
-			if (!strcmp(type, "8021ad"))
-				devtype = &vlandev_device_type;
-			else if (!strcmp(type, "8021q"))
-				devtype = &vlandev_device_type;
-			else if (!strcmp(type, "bridge"))
-				devtype = &bridge_device_type;
-			else if (!strcmp(type, "macvlan"))
-				devtype = &macvlan_device_type;
-			else if (!strcmp(type, "tunnel"))
-				devtype = &tunnel_device_type;
-		}
+		if (type)
+			devtype = device_type_get(type);
 
 		if (devtype)
 			params = devtype->config_params;
@@ -326,6 +301,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