X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=98c46b34196b11614d6f33f540e26740e67864fb;hp=1ca02564a9ac9fe8b45e49c5e22209643f45b375;hb=8125e561e33276cf80c5146c5fa3020b6f1425b8;hpb=314b33c511f8aa53c9fb97c6a9ad9d410f06af26

diff --git a/config.c b/config.c
index 1ca0256..98c46b3 100644
--- a/config.c
+++ b/config.c
@@ -1,3 +1,16 @@
+/*
+ * 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>
@@ -6,6 +19,7 @@
 
 #include "netifd.h"
 #include "interface.h"
+#include "interface-ip.h"
 #include "proto.h"
 #include "config.h"
 
@@ -15,7 +29,7 @@ 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,
+static bool uci_attr_to_blob(struct blob_buf *b, const char *str,
 			     const char *name, enum blobmsg_type type)
 {
 	char *err;
@@ -31,20 +45,21 @@ static void uci_attr_to_blob(struct blob_buf *b, const char *str,
 		else if (!strcmp(str, "false") || !strcmp(str, "0"))
 			intval = 0;
 		else
-			return;
+			return false;
 
 		blobmsg_add_u8(b, name, intval);
 		break;
 	case BLOBMSG_TYPE_INT32:
 		intval = strtol(str, &err, 0);
 		if (*err)
-			return;
+			return false;
 
 		blobmsg_add_u32(b, name, intval);
 		break;
 	default:
-		break;
+		return false;
 	}
+	return true;
 }
 
 static void uci_array_to_blob(struct blob_buf *b, struct uci_option *o,
@@ -73,14 +88,14 @@ 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 int __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;
+	int i, ret = 0;
 
 	uci_foreach_element(&s->options, e) {
 		for (i = 0; i < p->n_params; i++) {
@@ -101,24 +116,30 @@ static void __uci_to_blob(struct blob_buf *b, struct uci_section *s,
 			array = blobmsg_open_array(b, attr->name);
 			uci_array_to_blob(b, o, p->info[i].type);
 			blobmsg_close_array(b, array);
+			ret++;
 			continue;
 		}
 
 		if (o->type == UCI_TYPE_LIST)
 			continue;
 
-		uci_attr_to_blob(b, o->v.string, attr->name, attr->type);
+		ret += uci_attr_to_blob(b, o->v.string, attr->name, attr->type);
 	}
+
+	return ret;
 }
 
-static void uci_to_blob(struct blob_buf *b, struct uci_section *s,
-			const struct config_param_list *p)
+static int uci_to_blob(struct blob_buf *b, struct uci_section *s,
+		       const struct config_param_list *p)
 {
+	int ret = 0;
 	int i;
 
-	__uci_to_blob(b, s, p);
+	ret += __uci_to_blob(b, s, p);
 	for (i = 0; i < p->n_next; i++)
-		uci_to_blob(b, s, p->next[i]);
+		ret += uci_to_blob(b, s, p->next[i]);
+
+	return ret;
 }
 
 static int
@@ -142,19 +163,25 @@ 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;
 	struct blob_attr *config;
+	struct device *dev;
+	bool bridge = false;
 
 	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));
 	if (!iface)
@@ -165,14 +192,57 @@ config_parse_interface(struct uci_section *s)
 	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;
+
 	config = malloc(blob_pad_len(b.head));
-	if (!config) {
-		free(iface);
-		return;
-	}
+	if (!config)
+		goto error;
 
 	memcpy(config, b.head, blob_pad_len(b.head));
-	interface_add(iface, config);
+
+	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,
+	 * 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)
+		return;
+
+	blob_buf_init(&b, 0);
+	uci_to_blob(&b, s, dev->type->config_params);
+	if (blob_len(b.head) == 0)
+		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
@@ -182,7 +252,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)
@@ -193,9 +263,14 @@ 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, "bridge"))
+				devtype = &bridge_device_type;
+			else if (!strcmp(type, "tunnel"))
+				devtype = &tunnel_device_type;
+		}
+
+		if (!devtype)
 			devtype = &simple_device_type;
 
 		blob_buf_init(&b, 0);
@@ -244,6 +319,12 @@ __config_check_equal(struct blob_attr *c1, struct blob_attr *c2,
 {
 	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));
@@ -306,42 +387,78 @@ config_init_package(const char *config)
 			uci_unload(ctx, p);
 	}
 
-	if (uci_load(ctx, "network", &p))
+	if (uci_load(ctx, config, &p))
 		return NULL;
 
 	return p;
 }
 
-void
-config_init_interfaces(const char *name)
+static void
+config_init_interfaces(void)
 {
-	struct uci_context *ctx;
-	struct uci_package *p = NULL;
 	struct uci_element *e;
 
-	p = config_init_package("network");
-	ctx = uci_ctx;
-	if (!p) {
-		fprintf(stderr, "Failed to load network config\n");
-		return;
+	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);
 	}
 
-	uci_network = p;
-	config_init = true;
+	uci_foreach_element(&uci_network->sections, e) {
+		struct uci_section *s = uci_to_section(e);
 
-	config_init_devices();
+		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(&p->sections, e) {
+	uci_foreach_element(&uci_network->sections, e) {
 		struct uci_section *s = uci_to_section(e);
 
-		if (name && strcmp(s->e.name, name) != 0)
-			continue;
+		if (!strcmp(s->type, "route"))
+			config_parse_route(s, false);
+		else if (!strcmp(s->type, "route6"))
+			config_parse_route(s, true);
+	}
 
-		if (!strcmp(s->type, "interface"))
-			config_parse_interface(s);
+	vlist_for_each_element(&interfaces, iface, node)
+		interface_ip_update_complete(&iface->config_ip);
+}
+
+void
+config_init_all(void)
+{
+	uci_network = config_init_package("network");
+	if (!uci_network) {
+		fprintf(stderr, "Failed to load network config\n");
+		return;
 	}
-	device_free_unused(NULL);
+
+	vlist_update(&interfaces);
+	config_init = true;
+	device_lock();
+
+	device_reset_config();
+	config_init_devices();
+	config_init_interfaces();
+	config_init_routes();
+
 	config_init = false;
+	device_unlock();
 
+	device_reset_old();
+	device_init_pending();
+	vlist_flush(&interfaces);
+	device_free_unused(NULL);
 	interface_start_pending();
 }