X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=8705c16accaa799dcd32e91bc3734838df89e2d5;hp=18efe9692980dd08d963dd2e7af5d2f2a3effec9;hb=98565127c60cba3d5b747bb9eb698e06d187f45b;hpb=50eb00f20aaf86c84a24b8d2aaad13ffff52d3f1;ds=inline

diff --git a/config.c b/config.c
index 18efe96..8705c16 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)
@@ -69,10 +74,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 +112,96 @@ 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;
+}
+
+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);
+
+	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);
-	alloc_interface(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;
 
 	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);
 	}
 }
 
@@ -144,7 +215,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");
@@ -165,8 +238,8 @@ config_init_interfaces(const char *name)
 		if (!strcmp(s->type, "interface"))
 			config_parse_interface(s);
 	}
-	cleanup_devices();
+	device_free_unused(NULL);
 	config_init = false;
 
-	start_pending_interfaces();
+	interface_start_pending();
 }