X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=config.c;h=81cbd28180f42c817c139c2044d5425612ec7dcc;hb=3fa53680c85a6e029a3e7b4d673bffee4795fa52;hp=7ba687517618016b72fc13e17687d05ba7e06461;hpb=4ed89555c4b5e748ed407f7694b5c9b32eea2e54;p=project%2Fnetifd.git

diff --git a/config.c b/config.c
index 7ba6875..81cbd28 100644
--- a/config.c
+++ b/config.c
@@ -2,14 +2,19 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <uci.h>
+
 #include "netifd.h"
 #include "interface.h"
+#include "proto.h"
+#include "config.h"
 
-struct uci_context *uci_ctx;
-static struct uci_package *uci_network;
 bool config_init = false;
-static struct blob_buf b;
 
+static struct uci_context *uci_ctx;
+static struct uci_package *uci_network;
+static struct blob_buf b;
+static unsigned int config_version = 1;
 
 static void uci_attr_to_blob(struct blob_buf *b, const char *str,
 			     const char *name, enum blobmsg_type type)
@@ -72,7 +77,7 @@ static void uci_array_to_blob(struct blob_buf *b, struct uci_option *o,
 static void __uci_to_blob(struct blob_buf *b, struct uci_section *s,
 			  const struct config_param_list *p)
 {
-	const struct blobmsg_policy *attr;
+	const struct blobmsg_policy *attr = NULL;
 	struct uci_element *e;
 	struct uci_option *o;
 	void *array;
@@ -137,10 +142,22 @@ config_parse_bridge_interface(struct uci_section *s)
 	return 0;
 }
 
+void
+config_set_state(struct config_state *state, const struct blob_attr *attr)
+{
+	state->data = malloc(blob_pad_len(attr));
+	if (!state->data)
+		return;
+
+	memcpy(state->data, attr, blob_pad_len(attr));
+}
+
 static void
 config_parse_interface(struct uci_section *s)
 {
+	struct interface *iface;
 	const char *type;
+
 	DPRINTF("Create interface '%s'\n", s->e.name);
 
 	blob_buf_init(&b, 0);
@@ -151,10 +168,19 @@ config_parse_interface(struct uci_section *s)
 			return;
 
 	uci_to_blob(&b, s, &interface_attr_list);
-	interface_alloc(s->e.name, s, b.head);
+	iface = interface_alloc(s->e.name, b.head);
+	if (!iface)
+		return;
+
+	blob_buf_init(&b, 0);
+	if (iface->proto_handler && iface->proto_handler->config_params)
+		uci_to_blob(&b, s, iface->proto_handler->config_params);
+
+	proto_init_interface(iface, b.head);
+	iface->config.version = config_version;
 }
 
-void
+static void
 config_init_devices(void)
 {
 	struct uci_element *e;
@@ -210,7 +236,7 @@ config_init_interfaces(const char *name)
 		if (!strcmp(s->type, "interface"))
 			config_parse_interface(s);
 	}
-	device_free_all();
+	device_free_unused(NULL);
 	config_init = false;
 
 	interface_start_pending();