X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=ceca04db2fa46840ebd9e79f8f308e3bea538964;hb=eeef1270f5cc3c6872676d57c6d2befe372a6f20;hp=803c96c219d38621e5f449bb89d6e01cde232f91;hpb=23730375f27c32e0fe1a59c7a761dd85296a7a4a;p=meshlink

diff --git a/src/conf.c b/src/conf.c
index 803c96c2..ceca04db 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,9 +1,6 @@
 /*
     conf.c -- configuration code
-    Copyright (C) 1998 Robert van der Meulen
-                  1998-2005 Ivo Timmermans
-                  2000-2008 Guus Sliepen <guus@tinc-vpn.org>
-		  2000 Cris van Pelt
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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,31 +12,26 @@
     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 <assert.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 "utils.h"				/* for cp */
+#include "meshlink_internal.h"
+#include "netutl.h"             /* for str2address */
+#include "protocol.h"
+#include "utils.h"              /* for cp */
 #include "xalloc.h"
 
-avl_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 */
-
-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);
@@ -52,35 +44,24 @@ static int config_compare(const config_t *a, const config_t *b)
 	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();
-
-	*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)
-{
-	cp();
-
-	avl_delete_tree(*config_tree);
+void exit_configuration(splay_tree_t **config_tree) {
+	if(*config_tree)
+		splay_delete_tree(*config_tree);
 	*config_tree = NULL;
 }
 
-config_t *new_config(void)
-{
-	cp();
-
-	return xmalloc_and_zero(sizeof(config_t));
+config_t *new_config(void) {
+	return xzalloc(sizeof(config_t));
 }
 
-void free_config(config_t *cfg)
-{
-	cp();
-
+void free_config(config_t *cfg) {
 	if(cfg->variable)
 		free(cfg->variable);
 
@@ -93,24 +74,18 @@ void free_config(config_t *cfg)
 	free(cfg);
 }
 
-void config_add(avl_tree_t *config_tree, config_t *cfg)
-{
-	cp();
-
-	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;
 
-	cp();
-
 	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;
@@ -121,14 +96,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;
 
-	cp();
-
-	node = avl_search_node(config_tree, cfg);
+	node = splay_search_node(config_tree, cfg);
 
 	if(node) {
 		if(node->next) {
@@ -142,10 +114,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,203 +126,169 @@ 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"),
-		   cfg->variable, cfg->file, cfg->line);
+	logger(NULL, MESHLINK_ERROR, "\"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"),
-		   cfg->variable, cfg->file, cfg->line);
+	logger(NULL, MESHLINK_ERROR, "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 set_config_int(config_t *cfg, int val) {
 	if(!cfg)
 		return false;
 
-	*result = xstrdup(cfg->value);
+	char val_str[1024];
+	snprintf(val_str, sizeof(val_str), "%d", val);
+
+	if(cfg->value)
+		free(cfg->value);
+
+	cfg->value = xstrdup(val_str);
 
 	return true;
 }
 
-bool get_config_address(const config_t *cfg, struct addrinfo **result)
-{
-	struct addrinfo *ai;
+bool get_config_string(const config_t *cfg, char **result) {
+	if(!cfg)
+		return false;
 
-	cp();
+	*result = xstrdup(cfg->value);
 
+	return true;
+}
+
+bool set_config_string(config_t *cfg, const char *val) {
 	if(!cfg)
 		return false;
 
-	ai = str2addrinfo(cfg->value, NULL, 0);
-
-	if(ai) {
-		*result = ai;
-		return true;
-	}
+	if(cfg->value)
+		free(cfg->value);
 
-	logger(LOG_ERR, _("Hostname or IP address expected for configuration variable %s in %s line %d"),
-		   cfg->variable, cfg->file, cfg->line);
+	cfg->value = xstrdup(val);
 
-	return false;
+	return true;
 }
 
-bool get_config_subnet(const config_t *cfg, subnet_t ** result)
-{
-	subnet_t subnet = {0};
-
-	cp();
+bool get_config_address(const config_t *cfg, struct addrinfo **result) {
+	struct addrinfo *ai;
 
 	if(!cfg)
 		return false;
 
-	if(!str2net(&subnet, cfg->value)) {
-		logger(LOG_ERR, _("Subnet expected for configuration variable %s in %s line %d"),
-			   cfg->variable, cfg->file, cfg->line);
-		return false;
-	}
-
-	/* Teach newbies what subnets are... */
+	ai = str2addrinfo(cfg->value, NULL, 0);
 
-	if(((subnet.type == SUBNET_IPV4)
-		&& !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"),
-			   cfg->variable, cfg->file, cfg->line);
-		return false;
+	if(ai) {
+		*result = ai;
+		return true;
 	}
 
-	*(*result = new_subnet()) = subnet;
+	logger(NULL, MESHLINK_ERROR, "Hostname or IP address expected for configuration variable %s in %s line %d",
+	       cfg->variable, cfg->file, cfg->line);
 
-	return true;
+	return false;
 }
 
 /*
-  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;
-		}
+	/* kill newline and carriage return if necessary */
+	*newline = '\0';
+	if(newline > p && newline[-1] == '\r')
+		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 */
-			if(newline > p && newline[-1] == '\r')	/* and carriage return if necessary */
-				newline[-1] = '\0';
-			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';
+
+	len = strcspn(value, "\t =");
+	value += len;
+	value += strspn(value, "\t ");
+	if(*value == '=') {
+		value++;
+		value += strspn(value, "\t ");
 	}
+	variable[len] = '\0';
 
-	if(buf && buflen) {
-		*buflen = size;
-		*buf = line;
+	if(!*value) {
+		const char err[] = "No value for variable";
+		logger(NULL, MESHLINK_ERROR, "%s `%s' on line %d while reading config file %s",
+		       err, variable, lineno, fname);
+		return NULL;
 	}
 
-	return line;
+	cfg = new_config();
+	cfg->variable = xstrdup(variable);
+	cfg->value = xstrdup(value);
+	cfg->file = xstrdup(fname);
+	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(splay_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(NULL, MESHLINK_ERROR, "Cannot open config file %s: %s", fname, strerror(errno));
+		return false;
 	}
 
-	bufsize = 100;
-	buffer = xmalloc(bufsize);
-
 	for(;;) {
-		if(feof(fp)) {
-			err = 0;
-			break;
-		}
-
-		line = readline(fp, &buffer, &bufsize);
+		line = readline(fp, buffer, sizeof(buffer));
 
 		if(!line) {
-			err = -1;
+			if(feof(fp))
+				result = true;
 			break;
 		}
 
@@ -367,159 +302,185 @@ int 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;
+		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;
-		}
+bool write_config_file(const struct splay_tree_t *config_tree, const char *fname) {
+	FILE *fp;
 
-		cfg = new_config();
-		cfg->variable = xstrdup(variable);
-		cfg->value = xstrdup(value);
-		cfg->file = xstrdup(fname);
-		cfg->line = lineno;
+	fp = fopen(fname, "w+");
 
-		config_add(config_tree, cfg);
+	if(!fp) {
+		logger(NULL, MESHLINK_ERROR, "Cannot open config file %s: %s", fname, strerror(errno));
+		return false;
+	}
+
+	for splay_each(config_t, cnf, config_tree) {
+		if(fwrite(cnf->variable, sizeof(char), strlen(cnf->variable), fp) < strlen(cnf->variable))
+			goto error;
+
+		if(fwrite(" = ", sizeof(char), 3, fp) < 3)
+			goto error;
+
+		if(fwrite(cnf->value, sizeof(char), strlen(cnf->value), fp) < strlen(cnf->value))
+			goto error;
+
+		if(fwrite("\n", sizeof(char), 1, fp) < 1)
+			goto error;
 	}
 
-	free(buffer);
 	fclose(fp);
+	return true;
 
-	return err;
+error:
+	logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+	fclose(fp);
+	return false;
 }
 
-bool read_server_config()
-{
-	char *fname;
-	int x;
+bool read_server_config(meshlink_handle_t *mesh) {
+	char filename[PATH_MAX];
+	bool x;
 
-	cp();
+	snprintf(filename, PATH_MAX, "%s" SLASH "meshlink.conf", mesh->confbase);
+	errno = 0;
+	x = read_config_file(mesh->config, filename);
 
-	asprintf(&fname, "%s/tinc.conf", confbase);
-	x = read_config_file(config_tree, fname);
+	if(!x && errno)
+		logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", filename, strerror(errno));
 
-	if(x == -1) {				/* System error: complain */
-		logger(LOG_ERR, _("Failed to read `%s': %s"), fname, strerror(errno));
-	}
+	return x;
+}
 
-	free(fname);
+bool read_host_config(meshlink_handle_t *mesh, splay_tree_t *config_tree, const char *name) {
+	char filename[PATH_MAX];
+	bool x;
 
-	return x == 0;
+	snprintf(filename, PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+	x = read_config_file(config_tree, filename);
+
+	return x;
 }
 
-FILE *ask_and_open(const char *filename, const char *what)
-{
-	FILE *r;
-	char *directory;
-	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);
-	} else {
-		/* Ask for a file and/or directory name. */
-		fprintf(stdout, _("Please enter a file to save %s to [%s]: "),
-				what, filename);
-		fflush(stdout);
+bool write_host_config(struct meshlink_handle *mesh, const struct splay_tree_t *config_tree, const char *name) {
+	char filename[PATH_MAX];
 
-		fn = readline(stdin, NULL, NULL);
+	snprintf(filename, PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+	return write_config_file(config_tree, filename);
+}
 
-		if(!fn) {
-			fprintf(stderr, _("Error while reading stdin: %s\n"),
-					strerror(errno));
-			return NULL;
-		}
+bool modify_config_file(struct meshlink_handle *mesh, const char *name, const char *key, const char *value, int trim) {
+	assert(mesh && name && key);
 
-		if(!strlen(fn))
-			/* User just pressed enter. */
-			fn = xstrdup(filename);
-	}
+	char filename[PATH_MAX];
+	char tmpname[PATH_MAX];
+	bool error = false;
 
-#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();
-		asprintf(&p, "%s/%s", directory, fn);
-		free(fn);
-		free(directory);
-		fn = p;
+	snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+	snprintf(tmpname, sizeof(tmpname), "%s.tmp", filename);
+
+	FILE *fr = fopen(filename, "r");
+
+	if(!fr) {
+		logger(mesh, MESHLINK_ERROR, "Cannot open config file %s: %s", filename, strerror(errno));
+		return false;
 	}
 
-	umask(0077);				/* Disallow everything for group and other */
+	FILE *fw = fopen(tmpname, "w");
 
-	/* Open it first to keep the inode busy */
+	if(!fw) {
+		logger(mesh, MESHLINK_ERROR, "Cannot open temporary file %s: %s", tmpname, strerror(errno));
+		fclose(fr);
+		return false;
+	}
 
-	r = fopen(fn, "r+") ?: fopen(fn, "w+");
+	char buf[4096];
+	char *sep;
+	int found = 0;
 
-	if(!r) {
-		fprintf(stderr, _("Error opening file `%s': %s\n"),
-				fn, strerror(errno));
-		free(fn);
-		return NULL;
+	if(value) {
+		fprintf(fw, "%s = %s\n", key, value);
+		found++;
 	}
 
-	free(fn);
+	while(readline(fr, buf, sizeof(buf))) {
+		if(!*buf || *buf == '#')
+			goto copy;
 
-	return r;
-}
+		sep = strchr(buf, ' ');
+		if(!sep)
+			goto copy;
 
-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;
+		*sep = 0;
+		if(strcmp(buf, key)) {
+			*sep = ' ';
+			goto copy;
 		}
-		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);
+
+		// We found the key and the value. We already added it at the top, so ignore this one.
+		if(sep[1] == '=' && sep[2] == ' ' && !strcmp(sep + 3, value))
+			continue;
+
+		// We found the key but with a different value, delete it if wanted.
+		found++;
+		if((!value || trim) && found > trim)
+			continue;
+
+		*sep = ' ';
+
+copy:
+		fprintf(fw, "%s\n", buf);
+	}
+
+	if(ferror(fr))
+		error = true;
+
+	fclose(fr);
+
+	if(ferror(fw))
+		error = true;
+
+	if(fclose(fw))
+		error = true;
+
+	// If any error occured during reading or writing, exit.
+	if(error) {
+		unlink(tmpname);
+		return false;
 	}
 
-	return disabled;
+	// Try to atomically replace the old config file with the new one.
+#ifdef HAVE_MINGW
+	char bakname[PATH_MAX];
+	snprintf(bakname, sizeof(bakname), "%s.bak", filename);
+	if(rename(filename, bakname) || rename(tmpname, filename)) {
+		rename(bakname, filename);
+#else
+	if(rename(tmpname, filename)) {
+#endif
+		return false;
+	} else {
+#ifdef HAVE_MINGW
+		unlink(bakname);
+#endif
+		return true;
+	}
+}
+
+bool append_config_file(meshlink_handle_t *mesh, const char *name, const char *key, const char *value) {
+	return modify_config_file(mesh, name, key, value, 0);
 }