X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=d134a9050cbcc5521fd58ffe02823ed28a1b5a7d;hp=5a2e439b9294381a38ad6a7f6579ba26eb7bb433;hb=f4508267c9b5524c1ba9dffde16b1ab1dcd1f857;hpb=ea6dec1329b08109387f091b60a13d1b40839317

diff --git a/config.c b/config.c
index 5a2e439..d134a90 100644
--- a/config.c
+++ b/config.c
@@ -176,6 +176,14 @@ config_parse_interface(struct uci_section *s)
 	memcpy(config, b.head, blob_pad_len(b.head));
 	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;
@@ -207,7 +215,7 @@ config_init_devices(void)
 
 	uci_foreach_element(&uci_network->sections, e) {
 		struct uci_section *s = uci_to_section(e);
-		const struct device_type *devtype;
+		const struct device_type *devtype = NULL;
 		const char *type, *name;
 
 		if (strcmp(s->type, "device") != 0)
@@ -218,9 +226,14 @@ config_init_devices(void)
 			continue;
 
 		type = uci_lookup_option_string(uci_ctx, s, "type");
-		if (type && !strcmp(type, "bridge"))
-			devtype = &bridge_device_type;
-		else
+		if (type) {
+			if (!strcmp(type, "bridge"))
+				devtype = &bridge_device_type;
+			else if (!strcmp(type, "tunnel"))
+				devtype = &tunnel_device_type;
+		}
+
+		if (!devtype)
 			devtype = &simple_device_type;
 
 		blob_buf_init(&b, 0);
@@ -337,7 +350,7 @@ config_init_package(const char *config)
 			uci_unload(ctx, p);
 	}
 
-	if (uci_load(ctx, "network", &p))
+	if (uci_load(ctx, config, &p))
 		return NULL;
 
 	return p;
@@ -387,6 +400,7 @@ config_init_all(void)
 		return;
 	}
 
+	vlist_update(&interfaces);
 	config_init = true;
 	device_lock();
 
@@ -401,5 +415,6 @@ config_init_all(void)
 	device_reset_old();
 	device_init_pending();
 	device_free_unused(NULL);
+	vlist_flush(&interfaces);
 	interface_start_pending();
 }