X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=426f6dc41a74cd05dd507fd8fd087122dab9363f;hb=196806f90f40fcc0cf727abd4bed6bc5aefff5ff;hp=099b77dac1f39778ea8e2902f912bab9118152e5;hpb=33f241d97852d7a171f1aaf1bda7f66356ff889e;p=meshlink

diff --git a/src/conf.c b/src/conf.c
index 099b77da..426f6dc4 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,10 +1,6 @@
 /*
     conf.c -- configuration code
-    Copyright (C) 1998 Robert van der Meulen
-                  1998-2005 Ivo Timmermans
-                  2000-2010 Guus Sliepen <guus@tinc-vpn.org>
-                  2010-2011 Julien Muchembled <jm@jmuchemb.eu>
-		  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
@@ -22,26 +18,19 @@
 */
 
 #include "system.h"
+#include <assert.h>
 
 #include "splay_tree.h"
 #include "connection.h"
 #include "conf.h"
 #include "list.h"
 #include "logger.h"
-#include "netutl.h"				/* for str2address */
+#include "meshlink_internal.h"
+#include "netutl.h"             /* for str2address */
 #include "protocol.h"
-#include "utils.h"				/* for cp */
+#include "utils.h"              /* for cp */
 #include "xalloc.h"
 
-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 */
-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;
 
@@ -50,11 +39,6 @@ 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)
@@ -63,17 +47,18 @@ static int config_compare(const config_t *a, const config_t *b) {
 		return a->file ? strcmp(a->file, b->file) : 0;
 }
 
-void init_configuration(splay_tree_t ** config_tree) {
+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(splay_tree_t ** config_tree) {
-	splay_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) {
-	return xmalloc_and_zero(sizeof(config_t));
+	return xzalloc(sizeof(config_t));
 }
 
 void free_config(config_t *cfg) {
@@ -141,8 +126,8 @@ 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;
 }
@@ -154,12 +139,27 @@ 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",
-		   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 set_config_int(config_t *cfg, int val) {
+	if(!cfg)
+		return false;
+
+	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_string(const config_t *cfg, char **result) {
 	if(!cfg)
 		return false;
@@ -169,51 +169,35 @@ bool get_config_string(const config_t *cfg, char **result) {
 	return true;
 }
 
-bool get_config_address(const config_t *cfg, struct addrinfo **result) {
-	struct addrinfo *ai;
-
+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 = {NULL};
+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 subnet.net.ipv4.address))
-		|| ((subnet.type == SUBNET_IPV6)
-		&& !maskcheck(&subnet.net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof subnet.net.ipv6.address))) {
-		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;
 }
 
 /*
@@ -236,8 +220,9 @@ static char *readline(FILE * fp, char *buf, size_t buflen) {
 	if(!newline)
 		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;
@@ -264,19 +249,15 @@ config_t *parse_config_line(char *line, const char *fname, int lineno) {
 
 	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);
+		logger(NULL, MESHLINK_ERROR, "%s `%s' on line %d while reading config file %s",
+		       err, variable, lineno, fname);
 		return NULL;
 	}
 
 	cfg = new_config();
 	cfg->variable = xstrdup(variable);
 	cfg->value = xstrdup(value);
-	cfg->file = fname ? xstrdup(fname) : NULL;
+	cfg->file = xstrdup(fname);
 	cfg->line = lineno;
 
 	return cfg;
@@ -298,7 +279,7 @@ bool read_config_file(splay_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(NULL, MESHLINK_ERROR, "Cannot open config file %s: %s", fname, strerror(errno));
 		return false;
 	}
 
@@ -321,14 +302,14 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) {
 				ignore = false;
 			continue;
 		}
-		
+
 		if(!strncmp(line, "-----BEGIN", 10)) {
 			ignore = true;
 			continue;
 		}
 
 		cfg = parse_config_line(line, fname, lineno);
-		if (!cfg)
+		if(!cfg)
 			break;
 		config_add(config_tree, cfg);
 	}
@@ -338,104 +319,174 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) {
 	return result;
 }
 
-void read_config_options(splay_tree_t *config_tree, const char *prefix) {
-	list_node_t *node, *next;
-	size_t prefix_len = prefix ? strlen(prefix) : 0;
+bool write_config_file(const struct splay_tree_t *config_tree, const char *fname) {
+	FILE *fp;
 
-	for(node = cmdline_conf->tail; node; node = next) {
-		config_t *orig_cfg, *cfg = (config_t *)node->data;
-		next = node->prev;
+	fp = fopen(fname, "w+");
 
-		if(!prefix) {
-			if(strchr(cfg->variable, '.'))
-				continue;
-			node->data = NULL;
-			list_unlink_node(cmdline_conf, node);
-		} else {
-			if(strncmp(prefix, cfg->variable, prefix_len) ||
-			   cfg->variable[prefix_len] != '.')
-				continue;
-			/* Because host configuration is parsed again when
-			   reconnecting, nodes must not be freed when a prefix
-			   is given. */
-			orig_cfg = cfg;
-			cfg = new_config();
-			cfg->variable = xstrdup(orig_cfg->variable + prefix_len + 1);
-			cfg->value = xstrdup(orig_cfg->value);
-			cfg->file = NULL;
-			cfg->line = orig_cfg->line;
-		}
-		config_add(config_tree, cfg);
+	if(!fp) {
+		logger(NULL, MESHLINK_ERROR, "Cannot open config file %s: %s", fname, strerror(errno));
+		return false;
 	}
-}
 
-bool read_server_config(void) {
-	char *fname;
-	bool x;
+	for splay_each(config_t, cnf, config_tree) {
+		if(fwrite(cnf->variable, sizeof(char), strlen(cnf->variable), fp) < strlen(cnf->variable))
+			goto error;
 
-	read_config_options(config_tree, NULL);
+		if(fwrite(" = ", sizeof(char), 3, fp) < 3)
+			goto error;
 
-	xasprintf(&fname, "%s/tinc.conf", confbase);
-	x = read_config_file(config_tree, fname);
+		if(fwrite(cnf->value, sizeof(char), strlen(cnf->value), fp) < strlen(cnf->value))
+			goto error;
 
-	if(!x) {				/* System error: complain */
-		logger(LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
+		if(fwrite("\n", sizeof(char), 1, fp) < 1)
+			goto error;
 	}
 
-	free(fname);
+	fclose(fp);
+	return true;
 
-	return x;
+error:
+	logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+	fclose(fp);
+	return false;
 }
 
-bool read_connection_config(connection_t *c) {
-	char *fname;
+bool read_server_config(meshlink_handle_t *mesh) {
+	char filename[PATH_MAX];
 	bool x;
 
-	read_config_options(c->config_tree, c->name);
+	snprintf(filename, PATH_MAX,"%s" SLASH "meshlink.conf", mesh->confbase);
+	errno = 0;
+	x = read_config_file(mesh->config, filename);
 
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	x = read_config_file(c->config_tree, fname);
-	free(fname);
+	if(!x && errno)
+		logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", filename, strerror(errno));
 
 	return x;
 }
 
-bool disable_old_keys(FILE *f) {
-	char buf[100];
-	long pos;
-	bool disabled = false;
+bool read_host_config(meshlink_handle_t *mesh, splay_tree_t *config_tree, const char *name) {
+	char filename[PATH_MAX];
+	bool x;
+
+	snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+	x = read_config_file(config_tree, filename);
+
+	return x;
+}
 
-	rewind(f);
-	pos = ftell(f);
+bool write_host_config(struct meshlink_handle *mesh, const struct splay_tree_t *config_tree, const char *name) {
+	char filename[PATH_MAX];
 
-	if(pos < 0)
+	snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+	return write_config_file(config_tree, filename);
+}
+
+bool modify_config_file(struct meshlink_handle *mesh, const char *name, const char *key, const char *value, bool replace) {
+	assert(mesh && name && key && (replace || value));
+
+	char filename[PATH_MAX];
+	char tmpname[PATH_MAX];
+	bool error = false;
+
+	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;
+	}
+
+	FILE *fw = fopen(tmpname, "w");
+
+	if(!fw) {
+		logger(mesh, MESHLINK_ERROR, "Cannot open temporary file %s: %s", tmpname, strerror(errno));
+		fclose(fr);
 		return false;
+	}
+
+	char buf[4096];
+	char *sep;
+	bool found = false;
+
+	while(readline(fr, buf, sizeof buf)) {
+		if(!*buf || *buf == '#')
+			goto copy;
 
-	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;
+		sep = strchr(buf, ' ');
+		if(!sep)
+			goto copy;
+
+		*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';
-			if(fseek(f, pos, SEEK_SET))
-				break;
-			if(fputs(buf, f) <= 0)
-				break;
-			disabled = true;
+
+		if(!value) {
+			found = true;
+			continue;
 		}
-		pos = ftell(f);
-		if(pos < 0)
-			break;
+
+		// We found the key and the value. Keep one copy around.
+		if(sep[1] == '=' && sep[2] == ' ' && !strcmp(sep + 3, value)) {
+			if(found)
+				continue;
+			found = true;
+		}
+
+		// We found the key but with a different value, delete it if wanted.
+		if(!found && replace)
+			continue;
+
+		*sep = ' ';
+
+copy:
+		fprintf(fw, "%s\n", buf);
+	}
+
+	if(ferror(fr))
+		error = true;
+
+	fclose(fr);
+
+	// Add new key/value pair if necessary
+	if(!found && value)
+		fprintf(fw, "%s = %s\n", key, value);
+
+	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;
+	}
+
+	// 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;
 	}
+}
 
-	return disabled;
+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, false);
 }