X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=8472d44f0ff9c9dcaa9e4d59699a45921cca8265;hp=9f4247125ca752e0fe52a9555171b26ddad0545a;hb=b8f0ce8319a43d629c8de86df6951892b7e8d813;hpb=f8276b9b149f3b0c8f3cdf8d3d0c232bd92e3464

diff --git a/config.c b/config.c
index 9f42471..8472d44 100644
--- a/config.c
+++ b/config.c
@@ -6,6 +6,7 @@
 
 #include "netifd.h"
 #include "interface.h"
+#include "interface-ip.h"
 #include "proto.h"
 #include "config.h"
 
@@ -175,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;
@@ -188,6 +197,18 @@ config_parse_interface(struct uci_section *s)
 }
 
 static void
+config_parse_route(struct uci_section *s, bool v6)
+{
+	void *route;
+
+	blob_buf_init(&b, 0);
+	route = blobmsg_open_array(&b, "route");
+	uci_to_blob(&b, s, &route_attr_list);
+	blobmsg_close_array(&b, route);
+	interface_ip_add_route(NULL, blob_data(b.head), v6);
+}
+
+static void
 config_init_devices(void)
 {
 	struct uci_element *e;
@@ -324,40 +345,66 @@ 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;
 }
 
-void
-config_init_interfaces(const char *name)
+static void
+config_init_interfaces(void)
 {
-	struct uci_package *p = NULL;
 	struct uci_element *e;
 
-	p = config_init_package("network");
-	if (!p) {
+	uci_foreach_element(&uci_network->sections, e) {
+		struct uci_section *s = uci_to_section(e);
+
+		if (!strcmp(s->type, "interface"))
+			config_parse_interface(s);
+	}
+}
+
+static void
+config_init_routes(void)
+{
+	struct interface *iface;
+	struct uci_element *e;
+
+	vlist_for_each_element(&interfaces, iface, node)
+		interface_ip_update_start(&iface->config_ip);
+
+	uci_foreach_element(&uci_network->sections, e) {
+		struct uci_section *s = uci_to_section(e);
+
+		if (!strcmp(s->type, "route"))
+			config_parse_route(s, false);
+		else if (!strcmp(s->type, "route6"))
+			config_parse_route(s, true);
+	}
+
+	vlist_for_each_element(&interfaces, iface, node)
+		interface_ip_update_complete(&iface->config_ip);
+}
+
+void
+config_init_all(void)
+{
+	uci_network = config_init_package("network");
+	if (!uci_network) {
 		fprintf(stderr, "Failed to load network config\n");
 		return;
 	}
 
-	uci_network = p;
 	config_init = true;
+	device_lock();
 
 	device_reset_config();
 	config_init_devices();
+	config_init_interfaces();
+	config_init_routes();
 
-	uci_foreach_element(&p->sections, e) {
-		struct uci_section *s = uci_to_section(e);
-
-		if (name && strcmp(s->e.name, name) != 0)
-			continue;
-
-		if (!strcmp(s->type, "interface"))
-			config_parse_interface(s);
-	}
 	config_init = false;
+	device_unlock();
 
 	device_reset_old();
 	device_init_pending();