X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=2fba53480a49bae335fd9bc38b9d00ac476f7298;hp=ab736e08b376688612ffc206bf9bd765d9c62278;hb=5f739f10e9d7af0eb412102356434f905ed8f467;hpb=5d0a6b0744c7c57108773b34110ab487a24b3db6

diff --git a/config.c b/config.c
index ab736e0..2fba534 100644
--- a/config.c
+++ b/config.c
@@ -4,6 +4,7 @@
 
 #include "netifd.h"
 #include "interface.h"
+#include "proto.h"
 
 struct uci_context *uci_ctx;
 static struct uci_package *uci_network;
@@ -69,10 +70,10 @@ 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;
+	const struct blobmsg_policy *attr = NULL;
 	struct uci_element *e;
 	struct uci_option *o;
 	void *array;
@@ -107,30 +108,85 @@ static void uci_to_blob(struct blob_buf *b, struct uci_section *s,
 	}
 }
 
+static void uci_to_blob(struct blob_buf *b, struct uci_section *s,
+			const struct config_param_list *p)
+{
+	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 int
+config_parse_bridge_interface(struct uci_section *s)
+{
+	char *name;
+
+	name = alloca(strlen(s->e.name) + 4);
+	sprintf(name, "br-%s", s->e.name);
+	blobmsg_add_string(&b, "name", name);
+
+	uci_to_blob(&b, s, bridge_device_type.config_params);
+	if (!bridge_device_type.create(b.head)) {
+		DPRINTF("Failed to create bridge for interface '%s'\n", s->e.name);
+		return -EINVAL;
+	}
+
+	blob_buf_init(&b, 0);
+	blobmsg_add_string(&b, "ifname", name);
+	return 0;
+}
+
 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);
+
+	type = uci_lookup_option_string(uci_ctx, s, "type");
+	if (type && !strcmp(type, "bridge"))
+		if (config_parse_bridge_interface(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);
 }
 
 void
-config_device_inits(void)
+config_init_devices(void)
 {
 	struct uci_element *e;
 
 	uci_foreach_element(&uci_network->sections, e) {
 		struct uci_section *s = uci_to_section(e);
+		const struct device_type *devtype;
+		const char *type;
 
 		if (strcmp(s->type, "device") != 0)
 			continue;
 
 		blob_buf_init(&b, 0);
-		uci_to_blob(&b, s, &device_attr_list);
-		device_create(b.head, s);
+		type = uci_lookup_option_string(uci_ctx, s, "type");
+		if (type && !strcmp(type, "bridge"))
+			devtype = &bridge_device_type;
+		else
+			devtype = &simple_device_type;
+
+		uci_to_blob(&b, s, devtype->config_params);
+		devtype->create(b.head);
 	}
 }
 
@@ -154,7 +210,7 @@ config_init_interfaces(const char *name)
 	uci_network = p;
 	config_init = true;
 
-	config_device_inits();
+	config_init_devices();
 
 	uci_foreach_element(&p->sections, e) {
 		struct uci_section *s = uci_to_section(e);
@@ -165,7 +221,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();