X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=ff0410da10f44bf8a48a9aa16c96b3831a55b511;hp=0f7a6527bd94d02192a8928fcde68dcf255b387e;hb=39f5ec857a31fe65e14cdf9b75927297e78015bb;hpb=fc205d64fcd70cda2dc9176ce2662d71c51370ab

diff --git a/config.c b/config.c
index 0f7a652..ff0410d 100644
--- a/config.c
+++ b/config.c
@@ -2,14 +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 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)
@@ -69,10 +73,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,31 +111,167 @@ 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 (!device_create(name, &bridge_device_type, 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;
+	struct blob_attr *config;
+
 	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 = calloc(1, sizeof(*iface));
+	if (!iface)
+		return;
+
+	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);
+
+	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;
 
 	uci_foreach_element(&uci_network->sections, e) {
 		struct uci_section *s = uci_to_section(e);
+		const struct device_type *devtype;
+		const char *type, *name;
 
 		if (strcmp(s->type, "device") != 0)
 			continue;
 
+		name = uci_lookup_option_string(uci_ctx, s, "name");
+		if (!name)
+			continue;
+
+		type = uci_lookup_option_string(uci_ctx, s, "type");
+		if (type && !strcmp(type, "bridge"))
+			devtype = &bridge_device_type;
+		else
+			devtype = &simple_device_type;
+
 		blob_buf_init(&b, 0);
-		uci_to_blob(&b, s, &device_attr_list);
-		device_create(b.head, s);
+		uci_to_blob(&b, s, devtype->config_params);
+		device_create(name, devtype, b.head);
+	}
+}
+
+bool
+config_diff(struct blob_attr **tb1, struct blob_attr **tb2,
+	    const struct config_param_list *config, unsigned long *diff)
+{
+	bool ret = false;
+	int i;
+
+	for (i = 0; i < config->n_params; i++) {
+		if (!tb1[i] && !tb2[i])
+			continue;
+
+		if (!!tb1[i] != !!tb2[i])
+			goto mark;
+
+		if (blob_len(tb1[i]) != blob_len(tb2[i]))
+			goto mark;
+
+		if (memcmp(tb1[i], tb2[i], blob_pad_len(tb1[i])) != 0)
+			goto mark;
+
+		continue;
+
+mark:
+		ret = true;
+		if (diff)
+			set_bit(diff, i);
+		else
+			return ret;
 	}
+
+	return ret;
+}
+
+
+static bool
+__config_check_equal(struct blob_attr *c1, struct blob_attr *c2,
+		     const struct config_param_list *config)
+{
+	struct blob_attr **tb1, **tb2;
+
+	tb1 = alloca(config->n_params * sizeof(struct blob_attr *));
+	blobmsg_parse(config->params, config->n_params, tb1,
+		blob_data(c1), blob_len(c1));
+
+	tb2 = alloca(config->n_params * sizeof(struct blob_attr *));
+	blobmsg_parse(config->params, config->n_params, tb2,
+		blob_data(c2), blob_len(c2));
+
+	return !config_diff(tb1, tb2, config, NULL);
+}
+
+bool
+config_check_equal(struct blob_attr *c1, struct blob_attr *c2,
+		   const struct config_param_list *config)
+{
+	int i;
+
+	if (!__config_check_equal(c1, c2, config))
+		return false;
+
+	for (i = 0; i < config->n_next; i++) {
+		if (!__config_check_equal(c1, c2, config->next[i]))
+			return false;
+	}
+
+	return true;
 }
 
 void
@@ -144,7 +284,10 @@ config_init_interfaces(const char *name)
 	ctx = uci_alloc_context();
 	uci_ctx = ctx;
 
+#ifdef DUMMY_MODE
 	uci_set_confdir(ctx, "./config");
+	uci_set_savedir(ctx, "./tmp");
+#endif
 
 	if (uci_load(ctx, "network", &p)) {
 		fprintf(stderr, "Failed to load network config\n");
@@ -165,8 +308,8 @@ 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;
 
-	start_pending_interfaces();
+	interface_start_pending();
 }