X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=da58a45512d51b71ab8c2e200656e56ffc0423f3;hp=dc5d2dc21f705b4d4e1e745523e495db9b75fb0e;hb=667b1bac77b134cf32c98d5dc25619e8c3303f52;hpb=ff71f289022ccb91abc2726f16522d55b5ccf0f6

diff --git a/src/conf.c b/src/conf.c
index dc5d2dc2..da58a455 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -23,6 +23,7 @@
 #include "system.h"
 
 #include "avl_tree.h"
+#include "connection.h"
 #include "conf.h"
 #include "logger.h"
 #include "netutl.h"				/* for str2address */
@@ -335,20 +336,32 @@ bool read_config_file(avl_tree_t *config_tree, const char *fname) {
 	return result;
 }
 
-bool read_server_config() {
+void read_config_options(avl_tree_t *config_tree, const char *prefix) {
 	list_node_t *node, *next;
-	char *fname;
-	bool x;
+	size_t prefix_len = strlen(prefix);
 
 	for(node = cmdline_conf->tail; node; node = next) {
 		config_t *cfg = (config_t *)node->data;
 		next = node->prev;
-		if (!strchr(cfg->variable, '.')) {
-			config_add(config_tree, cfg);
-			node->data = NULL;
-			list_unlink_node(cmdline_conf, node);
-		}
+
+		if(!prefix && strchr(cfg->variable, '.'))
+			continue;
+
+		if(prefix && (strncmp(prefix, cfg->variable, prefix_len) || cfg->variable[prefix_len] != '.'))
+			continue;
+
+		config_add(config_tree, cfg);
+		node->data = NULL;
+		list_unlink_node(cmdline_conf, node);
 	}
+}
+
+bool read_server_config() {
+	list_node_t *node, *next;
+	char *fname;
+	bool x;
+
+	read_config_options(config_tree, NULL);
 
 	xasprintf(&fname, "%s/tinc.conf", confbase);
 	x = read_config_file(config_tree, fname);
@@ -362,6 +375,21 @@ bool read_server_config() {
 	return x;
 }
 
+bool read_connection_config(connection_t *c) {
+	list_node_t *node, *next;
+	size_t name_len = strlen(c->name);
+	char *fname;
+	bool x;
+
+	read_config_options(c->config_tree, c->name);
+
+	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
+	x = read_config_file(c->config_tree, fname);
+	free(fname);
+
+	return x;
+}
+
 FILE *ask_and_open(const char *filename, const char *what) {
 	FILE *r;
 	char *directory;