X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=6691e61dbbfd543c9c58ec8e771e78512cb839dd;hp=d3f1986990a664eeefdc6cebc54153254965cbd5;hb=f6f065d3997ccc8d42805529e4aad59b789579ad;hpb=7831c630912c9dc9e592d282ba1f9485c1dff9cc

diff --git a/config.c b/config.c
index d3f1986..6691e61 100644
--- a/config.c
+++ b/config.c
@@ -1,3 +1,17 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -6,119 +20,36 @@
 
 #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)
+static int
+config_section_idx(struct uci_section *s)
 {
-	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;
+	int idx = 0;
 
-		o = uci_to_option(e);
+	uci_foreach_element(&uci_wireless->sections, e) {
+		struct uci_section *cur = uci_to_section(e);
 
-		if (attr->type == BLOBMSG_TYPE_ARRAY) {
-			if (!p->info)
-				continue;
+		if (s == cur)
+			return idx;
 
-			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);
+		if (!strcmp(cur->type, s->type))
+			idx++;
 	}
-}
 
-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]);
+	return -1;
 }
 
 static int
@@ -142,38 +73,59 @@ 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;
+
+	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);
 	}
 
-	memcpy(config, b.head, blob_pad_len(b.head));
-	interface_add(iface, config);
+	/*
+	 * need to look up the interface name again, in case of config update,
+	 * the pointer will have changed
+	 */
+	iface = vlist_find(&interfaces, s->e.name, iface, node);
+	if (!iface)
+		return;
 
 	dev = iface->main_dev.dev;
 	if (!dev || !dev->default_config)
@@ -185,6 +137,35 @@ 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
+config_parse_route(struct uci_section *s, bool v6)
+{
+	void *route;
+
+	blob_buf_init(&b, 0);
+	route = blobmsg_open_array(&b, "route");
+	uci_to_blob(&b, s, &route_attr_list);
+	blobmsg_close_array(&b, route);
+	interface_ip_add_route(NULL, blob_data(b.head), 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
@@ -194,7 +175,7 @@ config_init_devices(void)
 
 	uci_foreach_element(&uci_network->sections, e) {
 		struct uci_section *s = uci_to_section(e);
-		const struct device_type *devtype;
+		const struct device_type *devtype = NULL;
 		const char *type, *name;
 
 		if (strcmp(s->type, "device") != 0)
@@ -205,9 +186,20 @@ config_init_devices(void)
 			continue;
 
 		type = uci_lookup_option_string(uci_ctx, s, "type");
-		if (type && !strcmp(type, "bridge"))
-			devtype = &bridge_device_type;
-		else
+		if (type) {
+			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;
+		}
+
+		if (!devtype)
 			devtype = &simple_device_type;
 
 		blob_buf_init(&b, 0);
@@ -216,151 +208,224 @@ config_init_devices(void)
 	}
 }
 
-bool
-config_diff(struct blob_attr **tb1, struct blob_attr **tb2,
-	    const struct config_param_list *config, unsigned long *diff)
+static struct uci_package *
+config_init_package(const char *config)
 {
-	bool ret = false;
-	int i;
+	struct uci_context *ctx = uci_ctx;
+	struct uci_package *p = NULL;
 
-	for (i = 0; i < config->n_params; i++) {
-		if (!tb1[i] && !tb2[i])
-			continue;
+	if (!ctx) {
+		ctx = uci_alloc_context();
+		uci_ctx = ctx;
 
-		if (!!tb1[i] != !!tb2[i])
-			goto mark;
+		ctx->flags &= ~UCI_FLAG_STRICT;
+		if (config_path)
+			uci_set_confdir(ctx, config_path);
 
-		if (blob_len(tb1[i]) != blob_len(tb2[i]))
-			goto mark;
+#ifdef DUMMY_MODE
+		uci_set_savedir(ctx, "./tmp");
+#endif
+	} else {
+		p = uci_lookup_package(ctx, config);
+		if (p)
+			uci_unload(ctx, p);
+	}
+
+	if (uci_load(ctx, config, &p))
+		return NULL;
 
-		if (memcmp(tb1[i], tb2[i], blob_raw_len(tb1[i])) != 0)
-			goto mark;
+	return p;
+}
 
-		continue;
+static void
+config_init_interfaces(void)
+{
+	struct uci_element *e;
 
-mark:
-		ret = true;
-		if (diff)
-			set_bit(diff, i);
-		else
-			return ret;
+	uci_foreach_element(&uci_network->sections, e) {
+		struct uci_section *s = uci_to_section(e);
+
+		if (!strcmp(s->type, "interface"))
+			config_parse_interface(s, false);
 	}
 
-	return ret;
+	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);
+	}
 }
 
+static void
+config_init_routes(void)
+{
+	struct interface *iface;
+	struct uci_element *e;
+
+	vlist_for_each_element(&interfaces, iface, node)
+		interface_ip_update_start(&iface->config_ip);
+
+	uci_foreach_element(&uci_network->sections, e) {
+		struct uci_section *s = uci_to_section(e);
+
+		if (!strcmp(s->type, "route"))
+			config_parse_route(s, false);
+		else if (!strcmp(s->type, "route6"))
+			config_parse_route(s, true);
+	}
 
-static bool
-__config_check_equal(struct blob_attr *c1, struct blob_attr *c2,
-		     const struct config_param_list *config)
+	vlist_for_each_element(&interfaces, iface, node)
+		interface_ip_update_complete(&iface->config_ip);
+}
+
+static void
+config_init_rules(void)
 {
-	struct blob_attr **tb1, **tb2;
+	struct uci_element *e;
 
-	if (!!c1 ^ !!c2)
-		return false;
+	iprule_update_start();
 
-	if (!c1 && !c2)
-		return true;
+	uci_foreach_element(&uci_network->sections, e) {
+		struct uci_section *s = uci_to_section(e);
 
-	tb1 = alloca(config->n_params * sizeof(struct blob_attr *));
-	blobmsg_parse(config->params, config->n_params, tb1,
-		blob_data(c1), blob_len(c1));
+		if (!strcmp(s->type, "rule"))
+			config_parse_rule(s, false);
+		else if (!strcmp(s->type, "rule6"))
+			config_parse_rule(s, true);
+	}
 
-	tb2 = alloca(config->n_params * sizeof(struct blob_attr *));
-	blobmsg_parse(config->params, config->n_params, tb2,
-		blob_data(c2), blob_len(c2));
+	iprule_update_complete();
+}
 
-	return !config_diff(tb1, tb2, config, NULL);
+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);
 }
 
-bool
-config_check_equal(struct blob_attr *c1, struct blob_attr *c2,
-		   const struct config_param_list *config)
+static void
+config_parse_wireless_device(struct uci_section *s)
 {
-	int i;
+	struct wireless_driver *drv;
+	const char *driver_name;
 
-	if (!__config_check_equal(c1, c2, config))
-		return false;
+	driver_name = uci_lookup_option_string(uci_ctx, s, "type");
+	if (!driver_name)
+		return;
 
-	for (i = 0; i < config->n_next; i++) {
-		if (!__config_check_equal(c1, c2, config->next[i]))
-			return false;
-	}
+	drv = avl_find_element(&wireless_drivers, driver_name, drv, node);
+	if (!drv)
+		return;
 
-	return true;
+	blob_buf_init(&b, 0);
+	uci_to_blob(&b, s, drv->device.config);
+	wireless_device_create(drv, s->e.name, b.head);
 }
 
-struct blob_attr *
-config_memdup(struct blob_attr *attr)
+static void
+config_parse_wireless_interface(struct wireless_device *wdev, struct uci_section *s)
 {
-	struct blob_attr *ret;
-	int size = blob_pad_len(attr);
+	char *name;
 
-	ret = malloc(size);
-	if (!ret)
-		return NULL;
+	name = alloca(strlen(s->type) + 16);
+	sprintf(name, "@%s[%d]", s->type, config_section_idx(s));
 
-	memcpy(ret, attr, size);
-	return ret;
+	blob_buf_init(&b, 0);
+	uci_to_blob(&b, s, wdev->drv->interface.config);
+	wireless_interface_create(wdev, b.head, s->anonymous ? name : s->e.name);
 }
 
-static struct uci_package *
-config_init_package(const char *config)
+static void
+config_init_wireless(void)
 {
-	struct uci_context *ctx = uci_ctx;
-	struct uci_package *p = NULL;
+	struct wireless_device *wdev;
+	struct uci_element *e;
+	const char *dev_name;
 
-	if (!ctx) {
-		ctx = uci_alloc_context();
-		uci_ctx = ctx;
+	if (!uci_wireless) {
+		DPRINTF("No wireless configuration found\n");
+		return;
+	}
 
-#ifdef DUMMY_MODE
-		uci_set_confdir(ctx, "./config");
-		uci_set_savedir(ctx, "./tmp");
-#endif
-	} else {
-		p = uci_lookup_package(ctx, config);
-		if (p)
-			uci_unload(ctx, p);
+	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);
 	}
 
-	if (uci_load(ctx, "network", &p))
-		return NULL;
+	vlist_flush(&wireless_devices);
 
-	return p;
+	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_interfaces(void)
+config_init_all(void)
 {
-	struct uci_package *p = NULL;
-	struct uci_element *e;
-
-	p = config_init_package("network");
-	if (!p) {
+	uci_network = config_init_package("network");
+	if (!uci_network) {
 		fprintf(stderr, "Failed to load network config\n");
 		return;
 	}
 
-	uci_network = p;
+	uci_wireless = config_init_package("wireless");
+
+	vlist_update(&interfaces);
 	config_init = true;
 	device_lock();
 
 	device_reset_config();
 	config_init_devices();
-
-	uci_foreach_element(&p->sections, e) {
-		struct uci_section *s = uci_to_section(e);
-
-		if (!strcmp(s->type, "interface"))
-			config_parse_interface(s);
-	}
+	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();
+	vlist_flush(&interfaces);
 	device_free_unused(NULL);
+	interface_refresh_assignments(false);
 	interface_start_pending();
+	wireless_start_pending();
 }