X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=d332e57a4e4359da1b8310d7208349400a0ecc68;hp=31ebb8dc117001a4f31ca48d46215964b88ca7ac;hb=b9f116ece5ca85c38105a8e33f0d9cc818a05694;hpb=df13b3ade3f366446033214b3a85228005c014ea

diff --git a/config.c b/config.c
index 31ebb8d..d332e57 100644
--- a/config.c
+++ b/config.c
@@ -2,16 +2,18 @@
 #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 unsigned int config_version = 1;
 
+static struct uci_context *uci_ctx;
+static struct uci_package *uci_network;
+static struct blob_buf b;
 
 static void uci_attr_to_blob(struct blob_buf *b, const char *str,
 			     const char *name, enum blobmsg_type type)
@@ -139,21 +141,12 @@ config_parse_bridge_interface(struct uci_section *s)
 	return 0;
 }
 
-void
-config_set_state(struct config_state *state, 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;
+	struct blob_attr *config;
 
 	DPRINTF("Create interface '%s'\n", s->e.name);
 
@@ -165,19 +158,26 @@ config_parse_interface(struct uci_section *s)
 			return;
 
 	uci_to_blob(&b, s, &interface_attr_list);
-	iface = interface_alloc(s->e.name, b.head);
+	iface = calloc(1, sizeof(*iface));
 	if (!iface)
 		return;
 
-	blob_buf_init(&b, 0);
+	interface_init(iface, s->e.name, b.head);
+
 	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;
+	config = malloc(blob_pad_len(b.head));
+	if (!config) {
+		free(iface);
+		return;
+	}
+
+	memcpy(config, b.head, blob_pad_len(b.head));
+	interface_add(iface, config);
 }
 
-void
+static void
 config_init_devices(void)
 {
 	struct uci_element *e;
@@ -212,7 +212,9 @@ config_init_interfaces(const char *name)
 	ctx = uci_alloc_context();
 	uci_ctx = ctx;
 
+#ifdef DUMMY_MODE
 	uci_set_confdir(ctx, "./config");
+#endif
 
 	if (uci_load(ctx, "network", &p)) {
 		fprintf(stderr, "Failed to load network config\n");