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

diff --git a/config.c b/config.c
index 9104a9c..1e465c5 100644
--- a/config.c
+++ b/config.c
@@ -2,16 +2,14 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/ethernet.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 uci_attr_to_blob(struct blob_buf *b, const char *str,
 			     const char *name, enum blobmsg_type type)
@@ -71,8 +69,8 @@ static void uci_array_to_blob(struct blob_buf *b, struct uci_option *o,
 	free(str);
 }
 
-static void uci_to_blob(struct blob_buf *b, struct uci_section *s,
-			const struct config_param_list *p)
+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;
@@ -109,80 +107,30 @@ static void uci_to_blob(struct blob_buf *b, struct uci_section *s,
 	}
 }
 
-static void
-config_parse_interface(struct uci_section *s)
-{
-	struct blob_buf b = {};
-
-	DPRINTF("Create interface '%s'\n", s->e.name);
-
-	blob_buf_init(&b, 0);
-	uci_to_blob(&b, s, &interface_attr_list);
-	alloc_interface(s->e.name, s, b.head);
-}
-
-enum {
-	SDEV_NAME,
-	SDEV_TYPE,
-	SDEV_MTU,
-	SDEV_MACADDR,
-	SDEV_TXQUEUELEN,
-	__SDEV_MAX,
-};
-
-static const struct uci_parse_option dev_opts[__SDEV_MAX] = {
-	[SDEV_NAME] = { "name", UCI_TYPE_STRING },
-	[SDEV_TYPE] = { "type", UCI_TYPE_STRING },
-	[SDEV_MTU] = { "mtu", UCI_TYPE_STRING },
-	[SDEV_MACADDR] = { "macaddr", UCI_TYPE_STRING },
-	[SDEV_TXQUEUELEN] = { "txqueuelen", UCI_TYPE_STRING },
-};
-
-static bool
-add_int_option(struct uci_option *o, unsigned int *dest)
+static void uci_to_blob(struct blob_buf *b, struct uci_section *s,
+			const struct config_param_list *p)
 {
-	char *error = NULL;
-	int val;
-
-	if (!o)
-		return false;
-
-	val = strtoul(o->v.string, &error, 0);
-	if (error && *error)
-		return false;
+	int i;
 
-	*dest = val;
-	return true;
+	__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_init_device_settings(struct device *dev, struct uci_option **opts)
+config_parse_interface(struct uci_section *s)
 {
-	struct ether_addr *ea;
-
-	dev->flags = 0;
-
-	if (add_int_option(opts[SDEV_MTU], &dev->mtu))
-		dev->flags |= DEV_OPT_MTU;
-
-	if (add_int_option(opts[SDEV_TXQUEUELEN], &dev->txqueuelen))
-		dev->flags |= DEV_OPT_TXQUEUELEN;
+	DPRINTF("Create interface '%s'\n", s->e.name);
 
-	if (opts[SDEV_MACADDR]) {
-		ea = ether_aton(opts[SDEV_MACADDR]->v.string);
-		if (ea) {
-			memcpy(dev->macaddr, ea, sizeof(dev->macaddr));
-			dev->flags |= DEV_OPT_MACADDR;
-		}
-	}
+	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;
-	struct device *dev;
-	struct uci_option *opts[__SDEV_MAX];
 
 	uci_foreach_element(&uci_network->sections, e) {
 		struct uci_section *s = uci_to_section(e);
@@ -190,25 +138,9 @@ config_init_devices(void)
 		if (strcmp(s->type, "device") != 0)
 			continue;
 
-		uci_parse_section(s, dev_opts, __SDEV_MAX, opts);
-		if (!opts[SDEV_NAME])
-			continue;
-
-		dev = NULL;
-		if (opts[SDEV_TYPE]) {
-			const char *type = opts[SDEV_TYPE]->v.string;
-
-			if (!strcmp(type, "bridge"))
-				dev = bridge_create(opts[SDEV_NAME]->v.string, s);
-		} else {
-			dev = get_device(opts[SDEV_NAME]->v.string, true);
-		}
-
-		if (!dev)
-			continue;
-
-		config_init_device_settings(dev, opts);
-		dev->config_hash = uci_hash_options(opts, __SDEV_MAX);
+		blob_buf_init(&b, 0);
+		uci_to_blob(&b, s, &device_attr_list);
+		device_create(b.head, s);
 	}
 }
 
@@ -243,8 +175,8 @@ config_init_interfaces(const char *name)
 		if (!strcmp(s->type, "interface"))
 			config_parse_interface(s);
 	}
-	cleanup_devices();
+	device_free_all();
 	config_init = false;
 
-	start_pending_interfaces();
+	interface_start_pending();
 }