X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=1d04efd7d1caf86d67e192c84d6bdd2c24089cc4;hp=6019862465d4a95e41ea0dcccc8308678ac55b0b;hb=4b7662c5841214c105a174fdc9ab9fac870abab9;hpb=6443a383c54dee0cd3b9858801e0b765147a4ef4

diff --git a/config.c b/config.c
index 6019862..1d04efd 100644
--- a/config.c
+++ b/config.c
@@ -1,186 +1,402 @@
+/*
+ * 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.
+ */
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/ethernet.h>
+#include <uci.h>
 
 #include "netifd.h"
 #include "interface.h"
+#include "interface-ip.h"
+#include "iprule.h"
+#include "proto.h"
+#include "wireless.h"
+#include "config.h"
 
-struct uci_context *uci_ctx;
-struct uci_package *uci_network;
 bool config_init = false;
 
-enum {
-	SIF_TYPE,
-	SIF_IFNAME,
-	__SIF_MAX,
-};
+static struct uci_context *uci_ctx;
+static struct uci_package *uci_network;
+static struct uci_package *uci_wireless;
+static struct blob_buf b;
 
-static const struct uci_parse_option if_opts[__SIF_MAX] = {
-	[SIF_TYPE] = { "type", UCI_TYPE_STRING },
-	[SIF_IFNAME] = { "ifname", UCI_TYPE_STRING },
-};
+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)) {
+		D(INTERFACE, "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)
+config_parse_interface(struct uci_section *s, bool alias)
 {
-	struct uci_option *opts[__SIF_MAX];
 	struct interface *iface;
+	const char *type = NULL, *disabled;
+	struct blob_attr *config;
 	struct device *dev;
-	const char *type;
-
-	DPRINTF("Create interface '%s'\n", s->e.name);
+	bool bridge = false;
 
-	iface = alloc_interface(s->e.name);
-	if (!iface)
+	disabled = uci_lookup_option_string(uci_ctx, s, "disabled");
+	if (disabled && !strcmp(disabled, "1"))
 		return;
 
-	uci_parse_section(s, if_opts, __SIF_MAX, opts);
-
-	if (opts[SIF_TYPE]) {
-		type = opts[SIF_TYPE]->v.string;
+	blob_buf_init(&b, 0);
 
-		if (!strcmp(type, "bridge")) {
-			interface_attach_bridge(iface, s);
+	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;
 	}
 
-	if (opts[SIF_IFNAME]) {
-		dev = get_device(opts[SIF_IFNAME]->v.string, true);
-		if (!dev)
-			return;
+	uci_to_blob(&b, s, &interface_attr_list);
+
+	iface = interface_alloc(s->e.name, b.head);
+	if (!iface)
+		return;
+
+	if (iface->proto_handler && iface->proto_handler->config_params)
+		uci_to_blob(&b, s, iface->proto_handler->config_params);
+
+	if (!bridge && uci_to_blob(&b, s, simple_device_type.config_params))
+		iface->device_config = true;
 
-		add_device_user(&iface->main_dev, dev);
+	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);
 	}
-}
 
-enum {
-	SDEV_NAME,
-	SDEV_TYPE,
-	SDEV_MTU,
-	SDEV_MACADDR,
-	SDEV_TXQUEUELEN,
-	__SDEV_MAX,
-};
-
-static const struct uci_parse_option dev_opts[__SDEV_MAX] = {
-	[SDEV_NAME] = { "name", UCI_TYPE_STRING },
-	[SDEV_TYPE] = { "type", UCI_TYPE_STRING },
-	[SDEV_MTU] = { "mtu", UCI_TYPE_STRING },
-	[SDEV_MACADDR] = { "macaddr", UCI_TYPE_STRING },
-	[SDEV_TXQUEUELEN] = { "txqueuelen", UCI_TYPE_STRING },
-};
-
-static bool
-add_int_option(struct uci_option *o, unsigned int *dest)
-{
-	char *error = NULL;
-	int val;
+	/*
+	 * 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;
 
-	if (!o)
-		return false;
+	dev = iface->main_dev.dev;
+	if (!dev || !dev->default_config)
+		return;
 
-	val = strtoul(o->v.string, &error, 0);
-	if (error && *error)
-		return false;
+	blob_buf_init(&b, 0);
+	uci_to_blob(&b, s, dev->type->config_params);
+	if (blob_len(b.head) == 0)
+		return;
 
-	*dest = val;
-	return true;
+	device_set_config(dev, dev->type, b.head);
+	return;
+error_free_config:
+	free(config);
+error:
+	free(iface);
 }
 
 static void
-config_init_device_settings(struct device *dev, struct uci_option **opts)
+config_parse_route(struct uci_section *s, bool v6)
 {
-	struct ether_addr *ea;
+	void *route;
 
-	dev->flags = 0;
-
-	if (add_int_option(opts[SDEV_MTU], &dev->mtu))
-		dev->flags |= DEV_OPT_MTU;
+	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);
+}
 
-	if (add_int_option(opts[SDEV_TXQUEUELEN], &dev->txqueuelen))
-		dev->flags |= DEV_OPT_TXQUEUELEN;
+static void
+config_parse_rule(struct uci_section *s, bool v6)
+{
+	void *rule;
 
-	if (opts[SDEV_MACADDR]) {
-		ea = ether_aton(opts[SDEV_MACADDR]->v.string);
-		if (ea) {
-			memcpy(dev->macaddr, ea, sizeof(dev->macaddr));
-			dev->flags |= DEV_OPT_MACADDR;
-		}
-	}
+	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);
 }
 
-void
+static void
 config_init_devices(void)
 {
 	struct uci_element *e;
-	struct device *dev;
-	struct uci_option *opts[__SDEV_MAX];
 
 	uci_foreach_element(&uci_network->sections, e) {
 		struct uci_section *s = uci_to_section(e);
+		const struct device_type *devtype = NULL;
+		const char *type, *name;
 
 		if (strcmp(s->type, "device") != 0)
 			continue;
 
-		uci_parse_section(s, dev_opts, __SDEV_MAX, opts);
-		if (!opts[SDEV_NAME])
+		name = uci_lookup_option_string(uci_ctx, s, "name");
+		if (!name)
 			continue;
 
-		dev = NULL;
-		if (opts[SDEV_TYPE]) {
-			const char *type = opts[SDEV_TYPE]->v.string;
-
+		type = uci_lookup_option_string(uci_ctx, s, "type");
+		if (type) {
 			if (!strcmp(type, "bridge"))
-				dev = bridge_create(opts[SDEV_NAME]->v.string, s);
-		} else {
-			dev = get_device(opts[SDEV_NAME]->v.string, true);
+				devtype = &bridge_device_type;
+			else if (!strcmp(type, "tunnel"))
+				devtype = &tunnel_device_type;
+			else if (!strcmp(type, "macvlan"))
+				devtype = &macvlan_device_type;
 		}
 
-		if (!dev)
-			continue;
+		if (!devtype)
+			devtype = &simple_device_type;
 
-		config_init_device_settings(dev, opts);
-		dev->config_hash = uci_hash_options(opts, __SDEV_MAX);
+		blob_buf_init(&b, 0);
+		uci_to_blob(&b, s, devtype->config_params);
+		device_create(name, devtype, b.head);
 	}
 }
 
-void
-config_init_interfaces(const char *name)
+static struct uci_package *
+config_init_package(const char *config)
 {
-	struct uci_context *ctx;
+	struct uci_context *ctx = uci_ctx;
 	struct uci_package *p = NULL;
+
+	if (!ctx) {
+		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_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;
+
+	return p;
+}
+
+static void
+config_init_interfaces(void)
+{
 	struct uci_element *e;
 
-	ctx = uci_alloc_context();
-	uci_ctx = ctx;
+	uci_foreach_element(&uci_network->sections, e) {
+		struct uci_section *s = uci_to_section(e);
 
-	uci_set_confdir(ctx, "./config");
+		if (!strcmp(s->type, "interface"))
+			config_parse_interface(s, false);
+	}
 
-	if (uci_load(ctx, "network", &p)) {
-		fprintf(stderr, "Failed to load network config\n");
+	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);
+	}
+
+	vlist_for_each_element(&interfaces, iface, node)
+		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;
 	}
 
-	uci_network = p;
-	config_init = true;
+	vlist_update(&wireless_devices);
 
-	config_init_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);
+	}
 
-	uci_foreach_element(&p->sections, e) {
+	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 (name && strcmp(s->e.name, name) != 0)
+		if (strcmp(s->type, "wifi-iface") != 0)
 			continue;
 
-		if (!strcmp(s->type, "interface"))
-			config_parse_interface(s);
+		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);
 	}
-	config_init = false;
 
-	start_pending_interfaces();
+	vlist_for_each_element(&wireless_devices, wdev, node)
+		vlist_flush(&wdev->interfaces);
+}
+
+void
+config_init_all(void)
+{
+	uci_network = config_init_package("network");
+	if (!uci_network) {
+		fprintf(stderr, "Failed to load network config\n");
+		return;
+	}
+
+	uci_wireless = config_init_package("wireless");
+
+	vlist_update(&interfaces);
+	config_init = true;
+	device_lock();
+
+	device_reset_config();
+	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();
+	vlist_flush(&interfaces);
+	device_free_unused(NULL);
+	interface_refresh_assignments(false);
+	interface_start_pending();
+	wireless_start_pending();
 }