X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=86c2599c5d1c9eb217d0a0cfa9f8cf081b13a017;hp=ff0410da10f44bf8a48a9aa16c96b3831a55b511;hb=d16871c7a55370174eb672edee24feade74cd37e;hpb=14fae227e03e69df2bf8af4c1490929459727ca8

diff --git a/config.c b/config.c
index ff0410d..86c2599 100644
--- a/config.c
+++ b/config.c
@@ -132,7 +132,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 +147,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 +174,17 @@ config_parse_interface(struct uci_section *s)
 
 	memcpy(config, b.head, blob_pad_len(b.head));
 	interface_add(iface, config);
+
+	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
@@ -223,7 +233,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 +256,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));
@@ -274,29 +290,63 @@ config_check_equal(struct blob_attr *c1, struct blob_attr *c2,
 	return true;
 }
 
-void
-config_init_interfaces(const char *name)
+struct blob_attr *
+config_memdup(struct blob_attr *attr)
+{
+	struct blob_attr *ret;
+	int size = blob_pad_len(attr);
+
+	ret = malloc(size);
+	if (!ret)
+		return NULL;
+
+	memcpy(ret, attr, size);
+	return ret;
+}
+
+static struct uci_package *
+config_init_package(const char *config)
 {
-	struct uci_context *ctx;
+	struct uci_context *ctx = uci_ctx;
 	struct uci_package *p = NULL;
-	struct uci_element *e;
 
-	ctx = uci_alloc_context();
-	uci_ctx = ctx;
+	if (!ctx) {
+		ctx = uci_alloc_context();
+		uci_ctx = ctx;
 
 #ifdef DUMMY_MODE
-	uci_set_confdir(ctx, "./config");
-	uci_set_savedir(ctx, "./tmp");
+		uci_set_confdir(ctx, "./config");
+		uci_set_savedir(ctx, "./tmp");
 #endif
+	} else {
+		p = uci_lookup_package(ctx, config);
+		if (p)
+			uci_unload(ctx, p);
+	}
+
+	if (uci_load(ctx, "network", &p))
+		return NULL;
+
+	return p;
+}
+
+void
+config_init_interfaces(const char *name)
+{
+	struct uci_package *p = NULL;
+	struct uci_element *e;
 
-	if (uci_load(ctx, "network", &p)) {
+	p = config_init_package("network");
+	if (!p) {
 		fprintf(stderr, "Failed to load network config\n");
 		return;
 	}
 
 	uci_network = p;
 	config_init = true;
+	device_lock();
 
+	device_reset_config();
 	config_init_devices();
 
 	uci_foreach_element(&p->sections, e) {
@@ -308,8 +358,12 @@ config_init_interfaces(const char *name)
 		if (!strcmp(s->type, "interface"))
 			config_parse_interface(s);
 	}
-	device_free_unused(NULL);
+
 	config_init = false;
+	device_unlock();
 
+	device_reset_old();
+	device_init_pending();
+	device_free_unused(NULL);
 	interface_start_pending();
 }