X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=d5bc9165804209608d30ced5bf589128e3b946ce;hb=79e46d08a46f2fef2ee4e8eac7ba487007160564;hp=688974ba7426a6d3f226a792f7ca452c83548ca9;hpb=a227843b739d279b63adcf3736ebb03d856080c4;p=meshlink

diff --git a/src/conf.c b/src/conf.c
index 688974ba..d5bc9165 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -22,14 +22,15 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "conf.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 */
@@ -52,12 +53,12 @@ static int config_compare(const config_t *a, const config_t *b) {
 		return strcmp(a->file, b->file);
 }
 
-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;
 }
 
@@ -78,18 +79,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.line = 0;
 
-	found = avl_search_closest_greater(config_tree, &cfg);
+	found = splay_search_closest_greater(config_tree, &cfg);
 
 	if(!found)
 		return NULL;
@@ -100,11 +101,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) {
@@ -130,7 +131,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(LOG_ERR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d",
 		   cfg->variable, cfg->file, cfg->line);
 
 	return false;
@@ -143,7 +144,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(LOG_ERR, "Integer expected for configuration variable %s in %s line %d",
 		   cfg->variable, cfg->file, cfg->line);
 
 	return false;
@@ -171,7 +172,7 @@ 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;
@@ -184,7 +185,7 @@ bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
 		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;
 	}
@@ -192,10 +193,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(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;
 	}
@@ -206,111 +207,60 @@ 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);
-	}
-
-	maxlen = size;
-	idx = line;
-	*idx = 0;
-
-	for(;;) {
-		errno = 0;
-		p = fgets(idx, maxlen, fp);
+	p = fgets(buf, buflen, fp);
 
-		if(!p) {				/* EOF or error */
-			if(feof(fp))
-				break;
+	if(!p)
+		return NULL;
 
-			/* otherwise: error; let the calling function print an error message if applicable */
-			free(line);
-			return NULL;
-		}
+	newline = strchr(p, '\n');
 
-		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 */
-		}
-	}
+	if(!newline)
+		return buf;
 
-	if(buf && buflen) {
-		*buflen = size;
-		*buf = line;
-	}
+	*newline = '\0';	/* kill newline */
+	if(newline > p && newline[-1] == '\r')	/* and carriage return if necessary */
+		newline[-1] = '\0';
 
-	return line;
+	return buf;
 }
 
 /*
   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 */
+int read_config_file(splay_tree_t *config_tree, const char *fname) {
 	FILE *fp;
-	char *buffer, *line;
+	char buffer[MAX_STRING_SIZE];
+	char *line;
 	char *variable, *value, *eol;
 	int lineno = 0;
 	int len;
 	bool ignore = false;
 	config_t *cfg;
-	size_t bufsize;
+	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(;;) {
-		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;
 		}
 
@@ -347,7 +297,7 @@ int read_config_file(avl_tree_t *config_tree, const char *fname) {
 
 	
 		if(!*value) {
-			logger(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"),
+			logger(LOG_ERR, "No value for variable `%s' on line %d while reading config file %s",
 				   variable, lineno, fname);
 			break;
 		}
@@ -361,89 +311,25 @@ int read_config_file(avl_tree_t *config_tree, const char *fname) {
 		config_add(config_tree, cfg);
 	}
 
-	free(buffer);
 	fclose(fp);
 
-	return err;
+	return result;
 }
 
 bool read_server_config() {
 	char *fname;
-	int x;
+	bool x;
 
 	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;
-}
-
-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);
-
-		fn = readline(stdin, NULL, NULL);
-
-		if(!fn) {
-			fprintf(stderr, _("Error while reading stdin: %s\n"),
-					strerror(errno));
-			return NULL;
-		}
-
-		if(!strlen(fn))
-			/* User just pressed enter. */
-			fn = xstrdup(filename);
-	}
-
-#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(fn);
-		free(directory);
-		fn = p;
-	}
-
-	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));
-		free(fn);
-		return NULL;
-	}
-
-	free(fn);
-
-	return r;
+	return x;
 }
 
 bool disable_old_keys(FILE *f) {