X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fconf.c;h=c5467d20ad3028583f1be2afa486340df6b38de1;hp=d567cd2f0cd12c6c8b9c0ba321297ed9b24470bd;hb=20ae7dd8c12390f7360eb28cc17e1b8a8a706b06;hpb=228e7a5c8f0e517dcede50f886965a44fca39853

diff --git a/src/conf.c b/src/conf.c
index d567cd2..c5467d2 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,9 +1,10 @@
 /*
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
-                  1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
-		  2000 Cris van Pelt <tribbel@arise.dhs.org>
+                  1998-2005 Ivo Timmermans
+                  2000-2010 Guus Sliepen <guus@tinc-vpn.org>
+                  2010 Julien Muchembled <jm@jmuchemb.eu>
+		  2000 Cris van Pelt
 
     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
@@ -15,19 +16,19 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
 #include "avl_tree.h"
+#include "connection.h"
 #include "conf.h"
 #include "logger.h"
 #include "netutl.h"				/* for str2address */
+#include "protocol.h"
 #include "utils.h"				/* for cp */
 #include "xalloc.h"
 
@@ -37,9 +38,10 @@ 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 */
+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)
-{
+static int config_compare(const config_t *a, const config_t *b) {
 	int result;
 
 	result = strcasecmp(a->variable, b->variable);
@@ -47,40 +49,33 @@ 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)
-{
-	cp();
-
+void init_configuration(avl_tree_t ** config_tree) {
 	*config_tree = avl_alloc_tree((avl_compare_t) config_compare, (avl_action_t) free_config);
 }
 
-void exit_configuration(avl_tree_t ** config_tree)
-{
-	cp();
-
+void exit_configuration(avl_tree_t ** config_tree) {
 	avl_delete_tree(*config_tree);
 	*config_tree = NULL;
 }
 
-config_t *new_config(void)
-{
-	cp();
-
+config_t *new_config(void) {
 	return xmalloc_and_zero(sizeof(config_t));
 }
 
-void free_config(config_t *cfg)
-{
-	cp();
-
+void free_config(config_t *cfg) {
 	if(cfg->variable)
 		free(cfg->variable);
 
@@ -93,21 +88,15 @@ void free_config(config_t *cfg)
 	free(cfg);
 }
 
-void config_add(avl_tree_t *config_tree, config_t *cfg)
-{
-	cp();
-
+void config_add(avl_tree_t *config_tree, config_t *cfg) {
 	avl_insert(config_tree, cfg);
 }
 
-config_t *lookup_config(avl_tree_t *config_tree, char *variable)
-{
+config_t *lookup_config(avl_tree_t *config_tree, char *variable) {
 	config_t cfg, *found;
 
-	cp();
-
 	cfg.variable = variable;
-	cfg.file = "";
+	cfg.file = NULL;
 	cfg.line = 0;
 
 	found = avl_search_closest_greater(config_tree, &cfg);
@@ -121,13 +110,10 @@ 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)
-{
+config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg) {
 	avl_node_t *node;
 	config_t *found;
 
-	cp();
-
 	node = avl_search_node(config_tree, cfg);
 
 	if(node) {
@@ -142,10 +128,7 @@ config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg)
 	return NULL;
 }
 
-bool get_config_bool(const config_t *cfg, bool *result)
-{
-	cp();
-
+bool get_config_bool(const config_t *cfg, bool *result) {
 	if(!cfg)
 		return false;
 
@@ -157,32 +140,26 @@ 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(LOG_ERR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d",
 		   cfg->variable, cfg->file, cfg->line);
 
 	return false;
 }
 
-bool get_config_int(const config_t *cfg, int *result)
-{
-	cp();
-
+bool get_config_int(const config_t *cfg, int *result) {
 	if(!cfg)
 		return false;
 
 	if(sscanf(cfg->value, "%d", result) == 1)
 		return true;
 
-	logger(LOG_ERR, _("Integer expected for configuration variable %s in %s line %d"),
+	logger(LOG_ERR, "Integer expected for configuration variable %s in %s line %d",
 		   cfg->variable, cfg->file, cfg->line);
 
 	return false;
 }
 
-bool get_config_string(const config_t *cfg, char **result)
-{
-	cp();
-
+bool get_config_string(const config_t *cfg, char **result) {
 	if(!cfg)
 		return false;
 
@@ -191,12 +168,9 @@ bool get_config_string(const config_t *cfg, char **result)
 	return true;
 }
 
-bool get_config_address(const config_t *cfg, struct addrinfo **result)
-{
+bool get_config_address(const config_t *cfg, struct addrinfo **result) {
 	struct addrinfo *ai;
 
-	cp();
-
 	if(!cfg)
 		return false;
 
@@ -207,23 +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(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)
-{
+bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
 	subnet_t subnet = {0};
 
-	cp();
-
 	if(!cfg)
 		return false;
 
 	if(!str2net(&subnet, cfg->value)) {
-		logger(LOG_ERR, _("Subnet expected for configuration variable %s in %s line %d"),
+		logger(LOG_ERR, "Subnet expected for configuration variable %s in %s line %d",
 			   cfg->variable, cfg->file, cfg->line);
 		return false;
 	}
@@ -234,7 +205,7 @@ bool get_config_subnet(const config_t *cfg, subnet_t ** result)
 		&& !maskcheck(&subnet.net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(ipv4_t)))
 		|| ((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"),
+		logger(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;
 	}
@@ -245,113 +216,97 @@ bool get_config_subnet(const config_t *cfg, subnet_t ** result)
 }
 
 /*
-  Read exactly one line and strip the trailing newline if any.  If the
-  file was on EOF, return NULL. Otherwise, return all the data in a
-  dynamically allocated buffer.
-
-  If line is non-NULL, it will be used as an initial buffer, to avoid
-  unnecessary mallocing each time this function is called.  If buf is
-  given, and buf needs to be expanded, the var pointed to by buflen
-  will be increased.
+  Read exactly one line and strip the trailing newline if any.
 */
-static char *readline(FILE * fp, char **buf, size_t *buflen)
-{
+static char *readline(FILE * fp, char *buf, size_t buflen) {
 	char *newline = NULL;
 	char *p;
-	char *line;					/* The array that contains everything that has been read so far */
-	char *idx;					/* Read into this pointer, which points to an offset within line */
-	size_t size, newsize;		/* The size of the current array pointed to by line */
-	size_t maxlen;				/* Maximum number of characters that may be read with fgets.  This is newsize - oldsize. */
 
 	if(feof(fp))
 		return NULL;
 
-	if(buf && buflen) {
-		size = *buflen;
-		line = *buf;
-	} else {
-		size = 100;
-		line = xmalloc(size);
-	}
+	p = fgets(buf, buflen, fp);
 
-	maxlen = size;
-	idx = line;
-	*idx = 0;
+	if(!p)
+		return NULL;
 
-	for(;;) {
-		errno = 0;
-		p = fgets(idx, maxlen, fp);
+	newline = strchr(p, '\n');
 
-		if(!p) {				/* EOF or error */
-			if(feof(fp))
-				break;
+	if(!newline)
+		return buf;
 
-			/* otherwise: error; let the calling function print an error message if applicable */
-			free(line);
-			return NULL;
-		}
+	*newline = '\0';	/* kill newline */
+	if(newline > p && newline[-1] == '\r')	/* and carriage return if necessary */
+		newline[-1] = '\0';
 
-		newline = strchr(p, '\n');
-
-		if(!newline) {			/* We haven't yet read everything to the end of the line */
-			newsize = size << 1;
-			line = xrealloc(line, newsize);
-			idx = &line[size - 1];
-			maxlen = newsize - size + 1;
-			size = newsize;
-		} else {
-			*newline = '\0';	/* kill newline */
-			break;				/* yay */
-		}
-	}
+	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';
 
-	if(buf && buflen) {
-		*buflen = size;
-		*buf = line;
+	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(LOG_ERR, "%s `%s' on line %d while reading config file %s",
+				err, variable, lineno, fname);
+		else
+			logger(LOG_ERR, "%s `%s' in command line option %d",
+				err, variable, lineno);
+		return NULL;
 	}
 
-	return line;
+	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.
 */
-int read_config_file(avl_tree_t *config_tree, const char *fname)
-{
-	int err = -2;				/* Parse error */
+bool read_config_file(avl_tree_t *config_tree, const char *fname) {
 	FILE *fp;
-	char *buffer, *line;
-	char *variable, *value, *eol;
+	char buffer[MAX_STRING_SIZE];
+	char *line;
 	int lineno = 0;
-	int len;
 	bool ignore = false;
 	config_t *cfg;
-	size_t bufsize;
-
-	cp();
+	bool result = false;
 
 	fp = fopen(fname, "r");
 
 	if(!fp) {
-		logger(LOG_ERR, _("Cannot open config file %s: %s"), fname,
-			   strerror(errno));
-		return -3;
+		logger(LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno));
+		return false;
 	}
 
-	bufsize = 100;
-	buffer = xmalloc(bufsize);
-
 	for(;;) {
-		line = readline(fp, &buffer, &bufsize);
+		line = readline(fp, buffer, sizeof buffer);
 
 		if(!line) {
-			err = -1;
-			break;
-		}
-
-		if(feof(fp)) {
-			err = 0;
+			if(feof(fp))
+				result = true;
 			break;
 		}
 
@@ -371,91 +326,100 @@ int read_config_file(avl_tree_t *config_tree, const char *fname)
 			continue;
 		}
 
-		variable = value = line;
+		cfg = parse_config_line(line, fname, lineno);
+		if (!cfg)
+			break;
+		config_add(config_tree, cfg);
+	}
 
-		eol = line + strlen(line);
-		while(strchr("\t ", *--eol))
-			*eol = '\0';
+	fclose(fp);
 
-		len = strcspn(value, "\t =");
-		value += len;
-		value += strspn(value, "\t ");
-		if(*value == '=') {
-			value++;
-			value += strspn(value, "\t ");
-		}
-		variable[len] = '\0';
+	return result;
+}
 
-	
-		if(!*value) {
-			logger(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"),
-				   variable, lineno, fname);
-			break;
-		}
+void read_config_options(avl_tree_t *config_tree, const char *prefix) {
+	list_node_t *node, *next;
+	size_t prefix_len = strlen(prefix);
 
-		cfg = new_config();
-		cfg->variable = xstrdup(variable);
-		cfg->value = xstrdup(value);
-		cfg->file = xstrdup(fname);
-		cfg->line = lineno;
+	for(node = cmdline_conf->tail; node; node = next) {
+		config_t *cfg = (config_t *)node->data;
+		next = node->prev;
 
-		config_add(config_tree, cfg);
-	}
+		if(!prefix && strchr(cfg->variable, '.'))
+			continue;
 
-	free(buffer);
-	fclose(fp);
+		if(prefix && (strncmp(prefix, cfg->variable, prefix_len) || cfg->variable[prefix_len] != '.'))
+			continue;
 
-	return err;
+		config_add(config_tree, cfg);
+		node->data = NULL;
+		list_unlink_node(cmdline_conf, node);
+	}
 }
 
-bool read_server_config()
-{
+bool read_server_config() {
+	list_node_t *node, *next;
 	char *fname;
-	int x;
+	bool x;
 
-	cp();
+	read_config_options(config_tree, NULL);
 
-	asprintf(&fname, "%s/tinc.conf", confbase);
+	xasprintf(&fname, "%s/tinc.conf", confbase);
 	x = read_config_file(config_tree, fname);
 
-	if(x == -1) {				/* System error: complain */
-		logger(LOG_ERR, _("Failed to read `%s': %s"), fname, strerror(errno));
+	if(!x) {				/* System error: complain */
+		logger(LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
 	}
 
 	free(fname);
 
-	return x == 0;
+	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, const char *mode)
-{
+FILE *ask_and_open(const char *filename, const char *what) {
 	FILE *r;
 	char *directory;
-	char *fn;
+	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 = xstrdup(filename);
+		fn = filename;
 	} else {
 		/* Ask for a file and/or directory name. */
-		fprintf(stdout, _("Please enter a file to save %s to [%s]: "),
+		fprintf(stdout, "Please enter a file to save %s to [%s]: ",
 				what, filename);
 		fflush(stdout);
 
-		fn = readline(stdin, NULL, NULL);
+		fn = readline(stdin, line, sizeof line);
 
 		if(!fn) {
-			fprintf(stderr, _("Error while reading stdin: %s\n"),
+			fprintf(stderr, "Error while reading stdin: %s\n",
 					strerror(errno));
 			return NULL;
 		}
 
 		if(!strlen(fn))
 			/* User just pressed enter. */
-			fn = xstrdup(filename);
+			fn = filename;
 	}
 
 #ifdef HAVE_MINGW
@@ -467,8 +431,7 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode)
 		char *p;
 
 		directory = get_current_dir_name();
-		asprintf(&p, "%s/%s", directory, fn);
-		free(fn);
+		xasprintf(&p, "%s/%s", directory, fn);
 		free(directory);
 		fn = p;
 	}
@@ -477,16 +440,53 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode)
 
 	/* Open it first to keep the inode busy */
 
-	r = fopen(fn, mode);
+	r = fopen(fn, "r+") ?: fopen(fn, "w+");
 
 	if(!r) {
-		fprintf(stderr, _("Error opening file `%s': %s\n"),
+		fprintf(stderr, "Error opening file `%s': %s\n",
 				fn, strerror(errno));
-		free(fn);
 		return NULL;
 	}
 
-	free(fn);
-
 	return r;
 }
+
+bool disable_old_keys(FILE *f) {
+	char buf[100];
+	long pos;
+	bool disabled = false;
+
+	rewind(f);
+	pos = ftell(f);
+
+	if(pos < 0)
+		return false;
+
+	while(fgets(buf, sizeof buf, f)) {
+		if(!strncmp(buf, "-----BEGIN RSA", 14)) {	
+			buf[11] = 'O';
+			buf[12] = 'L';
+			buf[13] = 'D';
+			if(fseek(f, pos, SEEK_SET))
+				break;
+			if(fputs(buf, f) <= 0)
+				break;
+			disabled = true;
+		}
+		else if(!strncmp(buf, "-----END RSA", 12)) {	
+			buf[ 9] = 'O';
+			buf[10] = 'L';
+			buf[11] = 'D';
+			if(fseek(f, pos, SEEK_SET))
+				break;
+			if(fputs(buf, f) <= 0)
+				break;
+			disabled = true;
+		}
+		pos = ftell(f);
+		if(pos < 0)
+			break;
+	}
+
+	return disabled;
+}