X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=1e465c5be0702f8d601d44c85c7747a056069124;hp=a106db24bf36ba2c26afc5e70b4bc3462e954283;hb=71016cda9739642fd49ffa949555e7240b7b1284;hpb=5d1fff7af6f77c9bf0d46572c7af563cd9fc55b3

diff --git a/config.c b/config.c
index a106db2..1e465c5 100644
--- a/config.c
+++ b/config.c
@@ -3,27 +3,149 @@
 #include <stdio.h>
 
 #include "netifd.h"
+#include "interface.h"
 
 struct uci_context *uci_ctx;
+static struct uci_package *uci_network;
+bool config_init = false;
+static struct blob_buf b;
 
-static void config_parse_interface(struct uci_section *s)
+
+static void uci_attr_to_blob(struct blob_buf *b, const char *str,
+			     const char *name, enum blobmsg_type type)
+{
+	char *err;
+	int intval;
+
+	switch (type) {
+	case BLOBMSG_TYPE_STRING:
+		blobmsg_add_string(b, name, str);
+		break;
+	case BLOBMSG_TYPE_BOOL:
+		if (!strcmp(str, "true") || !strcmp(str, "1"))
+			intval = 1;
+		else if (!strcmp(str, "false") || !strcmp(str, "0"))
+			intval = 0;
+		else
+			return;
+
+		blobmsg_add_u8(b, name, intval);
+		break;
+	case BLOBMSG_TYPE_INT32:
+		intval = strtol(str, &err, 0);
+		if (*err)
+			return;
+
+		blobmsg_add_u32(b, name, intval);
+		break;
+	default:
+		break;
+	}
+}
+
+static void uci_array_to_blob(struct blob_buf *b, struct uci_option *o,
+			      enum blobmsg_type type)
+{
+	struct uci_element *e;
+	char *str, *next, *word;
+
+	if (o->type == UCI_TYPE_LIST) {
+		uci_foreach_element(&o->v.list, e) {
+			uci_attr_to_blob(b, e->name, NULL, type);
+		}
+		return;
+	}
+
+	str = strdup(o->v.string);
+	next = str;
+
+	while ((word = strsep(&next, " \t")) != NULL) {
+		if (!*word)
+			continue;
+
+		uci_attr_to_blob(b, word, NULL, type);
+	}
+
+	free(str);
+}
+
+static void __uci_to_blob(struct blob_buf *b, struct uci_section *s,
+			  const struct config_param_list *p)
+{
+	const struct blobmsg_policy *attr;
+	struct uci_element *e;
+	struct uci_option *o;
+	void *array;
+	int i;
+
+	uci_foreach_element(&s->options, e) {
+		for (i = 0; i < p->n_params; i++) {
+			attr = &p->params[i];
+			if (!strcmp(attr->name, e->name))
+				break;
+		}
+
+		if (i == p->n_params)
+			continue;
+
+		o = uci_to_option(e);
+
+		if (attr->type == BLOBMSG_TYPE_ARRAY) {
+			if (!p->info)
+				continue;
+
+			array = blobmsg_open_array(b, attr->name);
+			uci_array_to_blob(b, o, p->info[i].type);
+			blobmsg_close_array(b, array);
+			continue;
+		}
+
+		if (o->type == UCI_TYPE_LIST)
+			continue;
+
+		uci_attr_to_blob(b, o->v.string, attr->name, attr->type);
+	}
+}
+
+static void uci_to_blob(struct blob_buf *b, struct uci_section *s,
+			const struct config_param_list *p)
 {
-	struct interface *iface;
-	const char *type;
+	int i;
+
+	__uci_to_blob(b, s, p);
+	for (i = 0; i < p->n_next; i++)
+		uci_to_blob(b, s, p->next[i]);
+}
 
+static void
+config_parse_interface(struct uci_section *s)
+{
 	DPRINTF("Create interface '%s'\n", s->e.name);
 
-	iface = alloc_interface(s->e.name);
-	type = uci_lookup_option_string(uci_ctx, s, "type");
+	blob_buf_init(&b, 0);
+	uci_to_blob(&b, s, &interface_attr_list);
+	interface_alloc(s->e.name, s, b.head);
+}
+
+void
+config_init_devices(void)
+{
+	struct uci_element *e;
+
+	uci_foreach_element(&uci_network->sections, e) {
+		struct uci_section *s = uci_to_section(e);
 
-	if (!type)
-		type = "";
+		if (strcmp(s->type, "device") != 0)
+			continue;
 
-	if (!strcmp(type, "bridge"))
-		interface_attach_bridge(iface, s);
+		blob_buf_init(&b, 0);
+		uci_to_blob(&b, s, &device_attr_list);
+		device_create(b.head, s);
+	}
 }
 
-void config_init_interfaces(const char *name)
+void
+config_init_interfaces(const char *name)
 {
 	struct uci_context *ctx;
 	struct uci_package *p = NULL;
@@ -39,6 +161,11 @@ void config_init_interfaces(const char *name)
 		return;
 	}
 
+	uci_network = p;
+	config_init = true;
+
+	config_init_devices();
+
 	uci_foreach_element(&p->sections, e) {
 		struct uci_section *s = uci_to_section(e);
 
@@ -48,4 +175,8 @@ void config_init_interfaces(const char *name)
 		if (!strcmp(s->type, "interface"))
 			config_parse_interface(s);
 	}
+	device_free_all();
+	config_init = false;
+
+	interface_start_pending();
 }