X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=7756247bfbafa24fac3c225baffb4d462c378f65;hp=f64fb22127ac018c5a54459b5b64bd8a70599238;hb=706d855e507980de3845556989d7de7a3b9c76e8;hpb=21f33b638291c2ffe7156e6c1e0df339f855d831

diff --git a/src/conf.c b/src/conf.c
index f64fb221..7756247b 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,9 +1,11 @@
 /*
     conf.c -- configuration code
-    Copyright (C) 1998 Robert van der Meulen
+    Copyright (C) 1998      Robert van der Meulen
                   1998-2005 Ivo Timmermans
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
-		  2000 Cris van Pelt
+                  2000      Cris van Pelt
+                  2010-2011 Julien Muchembled <jm@jmuchemb.eu>
+                  2000-2015 Guus Sliepen <guus@tinc-vpn.org>
+                  2013      Florent Clairambault <florent@clairambault.fr>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,20 +24,22 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
+#include "connection.h"
 #include "conf.h"
+#include "list.h"
 #include "logger.h"
-#include "netutl.h"				/* for str2address */
+#include "names.h"
+#include "netutl.h"             /* for str2address */
 #include "protocol.h"
-#include "utils.h"				/* for cp */
+#include "utils.h"              /* for cp */
 #include "xalloc.h"
 
-avl_tree_t *config_tree;
+splay_tree_t *config_tree;
 
-int pinginterval = 0;			/* seconds between pings */
-int pingtimeout = 0;			/* seconds to wait for response */
-char *confbase = NULL;			/* directory in which all config files are */
-char *netname = NULL;			/* name of the vpn network */
+int pinginterval = 0;           /* seconds between pings */
+int pingtimeout = 0;            /* seconds to wait for response */
+list_t *cmdline_conf = NULL;    /* global/host configuration values given at the command line */
 
 static int config_compare(const config_t *a, const config_t *b) {
 	int result;
@@ -45,25 +49,30 @@ static int config_compare(const config_t *a, const config_t *b) {
 	if(result)
 		return result;
 
+	/* give priority to command line options */
+	result = !b->file - !a->file;
+	if (result)
+		return result;
+
 	result = a->line - b->line;
 
 	if(result)
 		return result;
 	else
-		return strcmp(a->file, b->file);
+		return a->file ? strcmp(a->file, b->file) : 0;
 }
 
-void init_configuration(avl_tree_t ** config_tree) {
-	*config_tree = avl_alloc_tree((avl_compare_t) config_compare, (avl_action_t) free_config);
+void init_configuration(splay_tree_t ** config_tree) {
+	*config_tree = splay_alloc_tree((splay_compare_t) config_compare, (splay_action_t) free_config);
 }
 
-void exit_configuration(avl_tree_t ** config_tree) {
-	avl_delete_tree(*config_tree);
+void exit_configuration(splay_tree_t ** config_tree) {
+	splay_delete_tree(*config_tree);
 	*config_tree = NULL;
 }
 
 config_t *new_config(void) {
-	return xmalloc_and_zero(sizeof(config_t));
+	return xzalloc(sizeof(config_t));
 }
 
 void free_config(config_t *cfg) {
@@ -79,18 +88,18 @@ void free_config(config_t *cfg) {
 	free(cfg);
 }
 
-void config_add(avl_tree_t *config_tree, config_t *cfg) {
-	avl_insert(config_tree, cfg);
+void config_add(splay_tree_t *config_tree, config_t *cfg) {
+	splay_insert(config_tree, cfg);
 }
 
-config_t *lookup_config(avl_tree_t *config_tree, char *variable) {
+config_t *lookup_config(splay_tree_t *config_tree, char *variable) {
 	config_t cfg, *found;
 
 	cfg.variable = variable;
-	cfg.file = "";
+	cfg.file = NULL;
 	cfg.line = 0;
 
-	found = avl_search_closest_greater(config_tree, &cfg);
+	found = splay_search_closest_greater(config_tree, &cfg);
 
 	if(!found)
 		return NULL;
@@ -101,11 +110,11 @@ config_t *lookup_config(avl_tree_t *config_tree, char *variable) {
 	return found;
 }
 
-config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg) {
-	avl_node_t *node;
+config_t *lookup_config_next(splay_tree_t *config_tree, const config_t *cfg) {
+	splay_node_t *node;
 	config_t *found;
 
-	node = avl_search_node(config_tree, cfg);
+	node = splay_search_node(config_tree, cfg);
 
 	if(node) {
 		if(node->next) {
@@ -131,7 +140,7 @@ bool get_config_bool(const config_t *cfg, bool *result) {
 		return true;
 	}
 
-	logger(LOG_ERR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d",
+	logger(DEBUG_ALWAYS, LOG_ERR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d",
 		   cfg->variable, cfg->file, cfg->line);
 
 	return false;
@@ -144,7 +153,7 @@ bool get_config_int(const config_t *cfg, int *result) {
 	if(sscanf(cfg->value, "%d", result) == 1)
 		return true;
 
-	logger(LOG_ERR, "Integer expected for configuration variable %s in %s line %d",
+	logger(DEBUG_ALWAYS, LOG_ERR, "Integer expected for configuration variable %s in %s line %d",
 		   cfg->variable, cfg->file, cfg->line);
 
 	return false;
@@ -172,20 +181,20 @@ bool get_config_address(const config_t *cfg, struct addrinfo **result) {
 		return true;
 	}
 
-	logger(LOG_ERR, "Hostname or IP address expected for configuration variable %s in %s line %d",
+	logger(DEBUG_ALWAYS, LOG_ERR, "Hostname or IP address expected for configuration variable %s in %s line %d",
 		   cfg->variable, cfg->file, cfg->line);
 
 	return false;
 }
 
 bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
-	subnet_t subnet = {0};
+	subnet_t subnet = {NULL};
 
 	if(!cfg)
 		return false;
 
 	if(!str2net(&subnet, cfg->value)) {
-		logger(LOG_ERR, "Subnet expected for configuration variable %s in %s line %d",
+		logger(DEBUG_ALWAYS, LOG_ERR, "Subnet expected for configuration variable %s in %s line %d",
 			   cfg->variable, cfg->file, cfg->line);
 		return false;
 	}
@@ -193,10 +202,10 @@ bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
 	/* Teach newbies what subnets are... */
 
 	if(((subnet.type == SUBNET_IPV4)
-		&& !maskcheck(&subnet.net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(ipv4_t)))
+		&& !maskcheck(&subnet.net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof subnet.net.ipv4.address))
 		|| ((subnet.type == SUBNET_IPV6)
-		&& !maskcheck(&subnet.net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(ipv6_t)))) {
-		logger(LOG_ERR, "Network address and prefix length do not match for configuration variable %s in %s line %d",
+		&& !maskcheck(&subnet.net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof subnet.net.ipv6.address))) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Network address and prefix length do not match for configuration variable %s in %s line %d",
 			   cfg->variable, cfg->file, cfg->line);
 		return false;
 	}
@@ -224,26 +233,64 @@ static char *readline(FILE * fp, char *buf, size_t buflen) {
 	newline = strchr(p, '\n');
 
 	if(!newline)
-		return NULL;
+		return buf;
 
-	*newline = '\0';	/* kill newline */
-	if(newline > p && newline[-1] == '\r')	/* and carriage return if necessary */
+	/* kill newline and carriage return if necessary */
+	*newline = '\0';
+	if(newline > p && newline[-1] == '\r')
 		newline[-1] = '\0';
 
 	return buf;
 }
 
+config_t *parse_config_line(char *line, const char *fname, int lineno) {
+	config_t *cfg;
+	int len;
+	char *variable, *value, *eol;
+	variable = value = line;
+
+	eol = line + strlen(line);
+	while(strchr("\t ", *--eol))
+		*eol = '\0';
+
+	len = strcspn(value, "\t =");
+	value += len;
+	value += strspn(value, "\t ");
+	if(*value == '=') {
+		value++;
+		value += strspn(value, "\t ");
+	}
+	variable[len] = '\0';
+
+	if(!*value) {
+		const char err[] = "No value for variable";
+		if (fname)
+			logger(DEBUG_ALWAYS, LOG_ERR, "%s `%s' on line %d while reading config file %s",
+				err, variable, lineno, fname);
+		else
+			logger(DEBUG_ALWAYS, LOG_ERR, "%s `%s' in command line option %d",
+				err, variable, lineno);
+		return NULL;
+	}
+
+	cfg = new_config();
+	cfg->variable = xstrdup(variable);
+	cfg->value = xstrdup(value);
+	cfg->file = fname ? xstrdup(fname) : NULL;
+	cfg->line = lineno;
+
+	return cfg;
+}
+
 /*
   Parse a configuration file and put the results in the configuration tree
   starting at *base.
 */
-bool read_config_file(avl_tree_t *config_tree, const char *fname) {
+bool read_config_file(splay_tree_t *config_tree, const char *fname) {
 	FILE *fp;
 	char buffer[MAX_STRING_SIZE];
 	char *line;
-	char *variable, *value, *eol;
 	int lineno = 0;
-	int len;
 	bool ignore = false;
 	config_t *cfg;
 	bool result = false;
@@ -251,7 +298,7 @@ bool read_config_file(avl_tree_t *config_tree, const char *fname) {
 	fp = fopen(fname, "r");
 
 	if(!fp) {
-		logger(LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_DEBUG, "Cannot open config file %s: %s", fname, strerror(errno));
 		return false;
 	}
 
@@ -274,40 +321,15 @@ bool read_config_file(avl_tree_t *config_tree, const char *fname) {
 				ignore = false;
 			continue;
 		}
-		
+
 		if(!strncmp(line, "-----BEGIN", 10)) {
 			ignore = true;
 			continue;
 		}
 
-		variable = value = line;
-
-		eol = line + strlen(line);
-		while(strchr("\t ", *--eol))
-			*eol = '\0';
-
-		len = strcspn(value, "\t =");
-		value += len;
-		value += strspn(value, "\t ");
-		if(*value == '=') {
-			value++;
-			value += strspn(value, "\t ");
-		}
-		variable[len] = '\0';
-
-	
-		if(!*value) {
-			logger(LOG_ERR, "No value for variable `%s' on line %d while reading config file %s",
-				   variable, lineno, fname);
+		cfg = parse_config_line(line, fname, lineno);
+		if (!cfg)
 			break;
-		}
-
-		cfg = new_config();
-		cfg->variable = xstrdup(variable);
-		cfg->value = xstrdup(value);
-		cfg->file = xstrdup(fname);
-		cfg->line = lineno;
-
 		config_add(config_tree, cfg);
 	}
 
@@ -316,109 +338,96 @@ bool read_config_file(avl_tree_t *config_tree, const char *fname) {
 	return result;
 }
 
-bool read_server_config() {
-	char *fname;
-	bool x;
+void read_config_options(splay_tree_t *config_tree, const char *prefix) {
+	size_t prefix_len = prefix ? strlen(prefix) : 0;
 
-	xasprintf(&fname, "%s/tinc.conf", confbase);
-	x = read_config_file(config_tree, fname);
+	for(const list_node_t *node = cmdline_conf->tail; node; node = node->prev) {
+		const config_t *cfg = node->data;
+		config_t *new;
 
-	if(!x) {				/* System error: complain */
-		logger(LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
-	}
+		if(!prefix) {
+			if(strchr(cfg->variable, '.'))
+				continue;
+		} else {
+			if(strncmp(prefix, cfg->variable, prefix_len) ||
+			   cfg->variable[prefix_len] != '.')
+				continue;
+		}
 
-	free(fname);
+		new = new_config();
+		if(prefix)
+			new->variable = xstrdup(cfg->variable + prefix_len + 1);
+		else
+			new->variable = xstrdup(cfg->variable);
+		new->value = xstrdup(cfg->value);
+		new->file = NULL;
+		new->line = cfg->line;
 
-	return x;
+		config_add(config_tree, new);
+	}
 }
 
-FILE *ask_and_open(const char *filename, const char *what) {
-	FILE *r;
-	char *directory;
-	char line[PATH_MAX];
-	const char *fn;
-
-	/* Check stdin and stdout */
-	if(!isatty(0) || !isatty(1)) {
-		/* Argh, they are running us from a script or something.  Write
-		   the files to the current directory and let them burn in hell
-		   for ever. */
-		fn = filename;
-	} else {
-		/* Ask for a file and/or directory name. */
-		fprintf(stdout, "Please enter a file to save %s to [%s]: ",
-				what, filename);
-		fflush(stdout);
-
-		fn = readline(stdin, line, sizeof line);
-
-		if(!fn) {
-			fprintf(stderr, "Error while reading stdin: %s\n",
-					strerror(errno));
-			return NULL;
-		}
+bool read_server_config(void) {
+	char fname[PATH_MAX];
+	bool x;
 
-		if(!strlen(fn))
-			/* User just pressed enter. */
-			fn = filename;
-	}
+	read_config_options(config_tree, NULL);
+
+	snprintf(fname, sizeof fname, "%s" SLASH "tinc.conf", confbase);
+	errno = 0;
+	x = read_config_file(config_tree, fname);
 
-#ifdef HAVE_MINGW
-	if(fn[0] != '\\' && fn[0] != '/' && !strchr(fn, ':')) {
-#else
-	if(fn[0] != '/') {
-#endif
-		/* The directory is a relative path or a filename. */
-		char *p;
-
-		directory = get_current_dir_name();
-		xasprintf(&p, "%s/%s", directory, fn);
-		free(directory);
-		fn = p;
+	// We will try to read the conf files in the "conf.d" dir
+	if (x) {
+		char dname[PATH_MAX];
+		snprintf(dname, sizeof dname, "%s" SLASH "conf.d", confbase);
+		DIR *dir = opendir (dname);
+		// If we can find this dir
+		if (dir) { 
+			struct dirent *ep;
+			// We list all the files in it
+			while (x && (ep = readdir (dir))) {
+				size_t l = strlen(ep->d_name);
+				// And we try to read the ones that end with ".conf"
+				if (l > 5 && !strcmp(".conf", & ep->d_name[ l - 5 ])) {
+					snprintf(fname, sizeof fname, "%s" SLASH "%s", dname, ep->d_name);
+					x = read_config_file(config_tree, fname);
+				}
+			}
+			closedir (dir);
+		}
 	}
 
-	umask(0077);				/* Disallow everything for group and other */
+	if(!x && errno)
+		logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
 
-	/* Open it first to keep the inode busy */
+	return x;
+}
 
-	r = fopen(fn, "r+") ?: fopen(fn, "w+");
+bool read_host_config(splay_tree_t *config_tree, const char *name) {
+	char fname[PATH_MAX];
+	bool x;
 
-	if(!r) {
-		fprintf(stderr, "Error opening file `%s': %s\n",
-				fn, strerror(errno));
-		return NULL;
-	}
+	read_config_options(config_tree, name);
+
+	snprintf(fname, sizeof fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+	x = read_config_file(config_tree, fname);
 
-	return r;
+	return x;
 }
 
-bool disable_old_keys(FILE *f) {
-	char buf[100];
-	long pos;
-	bool disabled = false;
-
-	rewind(f);
-	pos = ftell(f);
-
-	while(fgets(buf, sizeof buf, f)) {
-		if(!strncmp(buf, "-----BEGIN RSA", 14)) {	
-			buf[11] = 'O';
-			buf[12] = 'L';
-			buf[13] = 'D';
-			fseek(f, pos, SEEK_SET);
-			fputs(buf, f);
-			disabled = true;
-		}
-		else if(!strncmp(buf, "-----END RSA", 12)) {	
-			buf[ 9] = 'O';
-			buf[10] = 'L';
-			buf[11] = 'D';
-			fseek(f, pos, SEEK_SET);
-			fputs(buf, f);
-			disabled = true;
-		}
-		pos = ftell(f);
+bool append_config_file(const char *name, const char *key, const char *value) {
+	char fname[PATH_MAX];
+	snprintf(fname, sizeof fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+
+	FILE *fp = fopen(fname, "a");
+
+	if(!fp) {
+		logger(DEBUG_ALWAYS, LOG_DEBUG, "Cannot open config file %s: %s", fname, strerror(errno));
+		return false;
 	}
 
-	return disabled;
+	fprintf(fp, "\n# The following line was automatically added by tinc\n%s = %s\n", key, value);
+	fclose(fp);
+	return true;
 }