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

diff --git a/config.c b/config.c
index 4f3a3cd..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"
 
@@ -132,7 +133,7 @@ config_parse_bridge_interface(struct uci_section *s)
 
 	uci_to_blob(&b, s, bridge_device_type.config_params);
 	if (!device_create(name, &bridge_device_type, b.head)) {
-		DPRINTF("Failed to create bridge for interface '%s'\n", s->e.name);
+		D(INTERFACE, "Failed to create bridge for interface '%s'\n", s->e.name);
 		return -EINVAL;
 	}
 
@@ -147,8 +148,7 @@ config_parse_interface(struct uci_section *s)
 	struct interface *iface;
 	const char *type;
 	struct blob_attr *config;
-
-	DPRINTF("Create interface '%s'\n", s->e.name);
+	struct device *dev;
 
 	blob_buf_init(&b, 0);
 
@@ -175,6 +175,37 @@ 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;
+
+	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);
+}
+
+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
@@ -223,7 +254,7 @@ config_diff(struct blob_attr **tb1, struct blob_attr **tb2,
 		if (blob_len(tb1[i]) != blob_len(tb2[i]))
 			goto mark;
 
-		if (memcmp(tb1[i], tb2[i], blob_pad_len(tb1[i])) != 0)
+		if (memcmp(tb1[i], tb2[i], blob_raw_len(tb1[i])) != 0)
 			goto mark;
 
 		continue;
@@ -246,6 +277,12 @@ __config_check_equal(struct blob_attr *c1, struct blob_attr *c2,
 {
 	struct blob_attr **tb1, **tb2;
 
+	if (!!c1 ^ !!c2)
+		return false;
+
+	if (!c1 && !c2)
+		return true;
+
 	tb1 = alloca(config->n_params * sizeof(struct blob_attr *));
 	blobmsg_parse(config->params, config->n_params, tb1,
 		blob_data(c1), blob_len(c1));
@@ -308,42 +345,69 @@ 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_context *ctx;
-	struct uci_package *p = NULL;
 	struct uci_element *e;
 
-	p = config_init_package("network");
-	ctx = uci_ctx;
-	if (!p) {
-		fprintf(stderr, "Failed to load network config\n");
-		return;
+	uci_foreach_element(&uci_network->sections, e) {
+		struct uci_section *s = uci_to_section(e);
+
+		if (!strcmp(s->type, "interface"))
+			config_parse_interface(s);
 	}
+}
 
-	uci_network = p;
-	config_init = true;
+static void
+config_init_routes(void)
+{
+	struct interface *iface;
+	struct uci_element *e;
 
-	config_init_devices();
+	vlist_for_each_element(&interfaces, iface, node)
+		interface_ip_update_start(&iface->config_ip);
 
-	uci_foreach_element(&p->sections, e) {
+	uci_foreach_element(&uci_network->sections, e) {
 		struct uci_section *s = uci_to_section(e);
 
-		if (name && strcmp(s->e.name, name) != 0)
-			continue;
+		if (!strcmp(s->type, "route"))
+			config_parse_route(s, false);
+		else if (!strcmp(s->type, "route6"))
+			config_parse_route(s, true);
+	}
 
-		if (!strcmp(s->type, "interface"))
-			config_parse_interface(s);
+	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;
 	}
-	device_free_unused(NULL);
+
+	config_init = true;
+	device_lock();
+
+	device_reset_config();
+	config_init_devices();
+	config_init_interfaces();
+	config_init_routes();
+
 	config_init = false;
+	device_unlock();
 
+	device_reset_old();
+	device_init_pending();
+	device_free_unused(NULL);
 	interface_start_pending();
 }