X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconf.c;h=d7df4e96893e240a9ae4616dfa53177be5989dd0;hb=8ac096b5bf9da1b3961a3ac4a03d083629222a63;hp=5f8fdb1e6b5bef4c6bdfa21afe9dac8649a178aa;hpb=67766d65f06854ee894d784f638c5c9cd2b50bca;p=tinc

diff --git a/src/conf.c b/src/conf.c
index 5f8fdb1e..d7df4e96 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -23,16 +23,17 @@
 
 #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 "protocol.h"
 #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 */
@@ -62,12 +63,12 @@ static int config_compare(const config_t *a, const config_t *b) {
 		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;
 }
 
@@ -88,18 +89,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 = NULL;
 	cfg.line = 0;
 
-	found = avl_search_closest_greater(config_tree, &cfg);
+	found = splay_search_closest_greater(config_tree, &cfg);
 
 	if(!found)
 		return NULL;
@@ -110,11 +111,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) {
@@ -140,7 +141,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;
@@ -153,7 +154,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;
@@ -181,20 +182,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;
 	}
@@ -202,10 +203,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;
 	}
@@ -264,10 +265,10 @@ 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",
+			logger(DEBUG_ALWAYS, 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",
+			logger(DEBUG_ALWAYS, LOG_ERR, "%s `%s' in command line option %d",
 				err, variable, lineno);
 		return NULL;
 	}
@@ -285,7 +286,7 @@ config_t *parse_config_line(char *line, const char *fname, int lineno) {
   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;
@@ -297,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_ERR, "Cannot open config file %s: %s", fname, strerror(errno));
 		return false;
 	}
 
@@ -337,7 +338,7 @@ bool read_config_file(avl_tree_t *config_tree, const char *fname) {
 	return result;
 }
 
-void read_config_options(avl_tree_t *config_tree, const char *prefix) {
+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;
 
@@ -368,7 +369,7 @@ void read_config_options(avl_tree_t *config_tree, const char *prefix) {
 	}
 }
 
-bool read_server_config() {
+bool read_server_config(void) {
 	char *fname;
 	bool x;
 
@@ -378,7 +379,7 @@ bool read_server_config() {
 	x = read_config_file(config_tree, fname);
 
 	if(!x) {				/* System error: complain */
-		logger(LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
 	}
 
 	free(fname);
@@ -399,64 +400,22 @@ bool read_connection_config(connection_t *c) {
 	return x;
 }
 
-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 append_config_file(const char *name, const char *key, const char *value) {
+	char *fname;
+	xasprintf(&fname, "%s/hosts/%s", confbase, name);
 
-		if(!strlen(fn))
-			/* User just pressed enter. */
-			fn = filename;
-	}
+	FILE *fp = fopen(fname, "a");
 
-#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;
+	if(!fp) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno));
+	} else {
+		fprintf(fp, "\n# The following line was automatically added by tinc\n%s = %s\n", key, value);
+		fclose(fp);
 	}
 
-	umask(0077);				/* Disallow everything for group and other */
-
-	/* Open it first to keep the inode busy */
-
-	r = fopen(fn, "r+") ?: fopen(fn, "w+");
-
-	if(!r) {
-		fprintf(stderr, "Error opening file `%s': %s\n",
-				fn, strerror(errno));
-		return NULL;
-	}
+	free(fname);
 
-	return r;
+	return fp;
 }
 
 bool disable_old_keys(FILE *f) {