X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=7720acf03084ca1d3cd79777047f3618cebb61bb;hp=5687b4c3f8c8bc318d6147228ae3aed2e70324e9;hb=6e70adc5eca0dc1cc52a5838e86d937efdf8a38c;hpb=bfe5db1ea8018aaa940dc6e991110fac62b85516

diff --git a/config.c b/config.c
index 5687b4c..7720acf 100644
--- a/config.c
+++ b/config.c
@@ -20,121 +20,18 @@
 #include "netifd.h"
 #include "interface.h"
 #include "interface-ip.h"
+#include "iprule.h"
 #include "proto.h"
+#include "wireless.h"
 #include "config.h"
 
 bool config_init = false;
 
 static struct uci_context *uci_ctx;
 static struct uci_package *uci_network;
+static struct uci_package *uci_wireless;
 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)
-{
-	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 = NULL;
-	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)
-{
-	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)
 {
@@ -156,38 +53,51 @@ config_parse_bridge_interface(struct uci_section *s)
 }
 
 static void
-config_parse_interface(struct uci_section *s)
+config_parse_interface(struct uci_section *s, bool alias)
 {
 	struct interface *iface;
-	const char *type;
+	const char *type = NULL, *disabled;
 	struct blob_attr *config;
 	struct device *dev;
+	bool bridge = false;
+
+	disabled = uci_lookup_option_string(uci_ctx, s, "disabled");
+	if (disabled && !strcmp(disabled, "1"))
+		return;
 
 	blob_buf_init(&b, 0);
 
-	type = uci_lookup_option_string(uci_ctx, s, "type");
-	if (type && !strcmp(type, "bridge"))
+	if (!alias)
+		type = uci_lookup_option_string(uci_ctx, s, "type");
+	if (type && !strcmp(type, "bridge")) {
 		if (config_parse_bridge_interface(s))
 			return;
 
+		bridge = true;
+	}
+
 	uci_to_blob(&b, s, &interface_attr_list);
-	iface = calloc(1, sizeof(*iface));
+
+	iface = interface_alloc(s->e.name, b.head);
 	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;
-	}
+	if (!bridge && uci_to_blob(&b, s, simple_device_type.config_params))
+		iface->device_config = true;
 
-	memcpy(config, b.head, blob_pad_len(b.head));
-	interface_add(iface, config);
+	config = blob_memdup(b.head);
+	if (!config)
+		goto error;
+
+	if (alias) {
+		if (!interface_add_alias(iface, config))
+			goto error_free_config;
+	} else {
+		interface_add(iface, config);
+	}
 
 	/*
 	 * need to look up the interface name again, in case of config update,
@@ -207,6 +117,11 @@ config_parse_interface(struct uci_section *s)
 		return;
 
 	device_set_config(dev, dev->type, b.head);
+	return;
+error_free_config:
+	free(config);
+error:
+	free(iface);
 }
 
 static void
@@ -222,6 +137,18 @@ config_parse_route(struct uci_section *s, bool v6)
 }
 
 static void
+config_parse_rule(struct uci_section *s, bool v6)
+{
+	void *rule;
+
+	blob_buf_init(&b, 0);
+	rule = blobmsg_open_array(&b, "rule");
+	uci_to_blob(&b, s, &rule_attr_list);
+	blobmsg_close_array(&b, rule);
+	iprule_add(blob_data(b.head), v6);
+}
+
+static void
 config_init_devices(void)
 {
 	struct uci_element *e;
@@ -240,8 +167,14 @@ config_init_devices(void)
 
 		type = uci_lookup_option_string(uci_ctx, s, "type");
 		if (type) {
-			if (!strcmp(type, "bridge"))
+			if (!strcmp(type, "8021ad"))
+				devtype = &vlandev_device_type;
+			else if (!strcmp(type, "8021q"))
+				devtype = &vlandev_device_type;
+			else if (!strcmp(type, "bridge"))
 				devtype = &bridge_device_type;
+			else if (!strcmp(type, "macvlan"))
+				devtype = &macvlan_device_type;
 			else if (!strcmp(type, "tunnel"))
 				devtype = &tunnel_device_type;
 		}
@@ -255,94 +188,6 @@ config_init_devices(void)
 	}
 }
 
-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_raw_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;
-
-	if (!!c1 ^ !!c2)
-		return false;
-
-	if (!c1 && !c2)
-		return true;
-
-	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;
-}
-
-struct blob_attr *
-config_memdup(struct blob_attr *attr)
-{
-	struct blob_attr *ret;
-	int size = blob_pad_len(attr);
-
-	ret = malloc(size);
-	if (!ret)
-		return NULL;
-
-	memcpy(ret, attr, size);
-	return ret;
-}
-
 static struct uci_package *
 config_init_package(const char *config)
 {
@@ -353,8 +198,11 @@ config_init_package(const char *config)
 		ctx = uci_alloc_context();
 		uci_ctx = ctx;
 
+		ctx->flags &= ~UCI_FLAG_STRICT;
+		if (config_path)
+			uci_set_confdir(ctx, config_path);
+
 #ifdef DUMMY_MODE
-		uci_set_confdir(ctx, "./config");
 		uci_set_savedir(ctx, "./tmp");
 #endif
 	} else {
@@ -378,7 +226,14 @@ config_init_interfaces(void)
 		struct uci_section *s = uci_to_section(e);
 
 		if (!strcmp(s->type, "interface"))
-			config_parse_interface(s);
+			config_parse_interface(s, false);
+	}
+
+	uci_foreach_element(&uci_network->sections, e) {
+		struct uci_section *s = uci_to_section(e);
+
+		if (!strcmp(s->type, "alias"))
+			config_parse_interface(s, true);
 	}
 }
 
@@ -404,6 +259,117 @@ config_init_routes(void)
 		interface_ip_update_complete(&iface->config_ip);
 }
 
+static void
+config_init_rules(void)
+{
+	struct uci_element *e;
+
+	iprule_update_start();
+
+	uci_foreach_element(&uci_network->sections, e) {
+		struct uci_section *s = uci_to_section(e);
+
+		if (!strcmp(s->type, "rule"))
+			config_parse_rule(s, false);
+		else if (!strcmp(s->type, "rule6"))
+			config_parse_rule(s, true);
+	}
+
+	iprule_update_complete();
+}
+
+static void
+config_init_globals(void)
+{
+	struct uci_section *globals = uci_lookup_section(
+			uci_ctx, uci_network, "globals");
+	if (!globals)
+		return;
+
+	const char *ula_prefix = uci_lookup_option_string(
+			uci_ctx, globals, "ula_prefix");
+	interface_ip_set_ula_prefix(ula_prefix);
+}
+
+static void
+config_parse_wireless_device(struct uci_section *s)
+{
+	struct wireless_driver *drv;
+	const char *driver_name;
+
+	driver_name = uci_lookup_option_string(uci_ctx, s, "type");
+	if (!driver_name)
+		return;
+
+	drv = avl_find_element(&wireless_drivers, driver_name, drv, node);
+	if (!drv)
+		return;
+
+	blob_buf_init(&b, 0);
+	uci_to_blob(&b, s, drv->device.config);
+	wireless_device_create(drv, s->e.name, b.head);
+}
+
+static void
+config_parse_wireless_interface(struct wireless_device *wdev, struct uci_section *s)
+{
+	blob_buf_init(&b, 0);
+	uci_to_blob(&b, s, wdev->drv->interface.config);
+	wireless_interface_create(wdev, b.head, s->e.name);
+}
+
+static void
+config_init_wireless(void)
+{
+	struct wireless_device *wdev;
+	struct uci_element *e;
+	const char *dev_name;
+
+	if (!uci_wireless) {
+		DPRINTF("No wireless configuration found\n");
+		return;
+	}
+
+	vlist_update(&wireless_devices);
+
+	uci_foreach_element(&uci_wireless->sections, e) {
+		struct uci_section *s = uci_to_section(e);
+		if (strcmp(s->type, "wifi-device") != 0)
+			continue;
+
+		config_parse_wireless_device(s);
+	}
+
+	vlist_flush(&wireless_devices);
+
+	vlist_for_each_element(&wireless_devices, wdev, node) {
+		wdev->vif_idx = 0;
+		vlist_update(&wdev->interfaces);
+	}
+
+	uci_foreach_element(&uci_wireless->sections, e) {
+		struct uci_section *s = uci_to_section(e);
+
+		if (strcmp(s->type, "wifi-iface") != 0)
+			continue;
+
+		dev_name = uci_lookup_option_string(uci_ctx, s, "device");
+		if (!dev_name)
+			continue;
+
+		wdev = vlist_find(&wireless_devices, dev_name, wdev, node);
+		if (!wdev) {
+			DPRINTF("device %s not found!\n", dev_name);
+			continue;
+		}
+
+		config_parse_wireless_interface(wdev, s);
+	}
+
+	vlist_for_each_element(&wireless_devices, wdev, node)
+		vlist_flush(&wdev->interfaces);
+}
+
 void
 config_init_all(void)
 {
@@ -413,6 +379,8 @@ config_init_all(void)
 		return;
 	}
 
+	uci_wireless = config_init_package("wireless");
+
 	vlist_update(&interfaces);
 	config_init = true;
 	device_lock();
@@ -421,13 +389,18 @@ config_init_all(void)
 	config_init_devices();
 	config_init_interfaces();
 	config_init_routes();
+	config_init_rules();
+	config_init_globals();
+	config_init_wireless();
 
 	config_init = false;
 	device_unlock();
 
 	device_reset_old();
 	device_init_pending();
-	device_free_unused(NULL);
 	vlist_flush(&interfaces);
+	device_free_unused(NULL);
+	interface_refresh_assignments(false);
 	interface_start_pending();
+	wireless_start_pending();
 }