X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=207f6005cd97967bd3f1c03fc985cbe2fe3b4915;hb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;hp=b9bfbf67ace863bc09d09d05f64ec6c2aa36bd14;hpb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;p=meshlink

diff --git a/src/conf.c b/src/conf.c
index b9bfbf67..207f6005 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-2012 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
@@ -37,10 +33,6 @@ 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 +42,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)
@@ -73,7 +60,7 @@ void exit_configuration(splay_tree_t ** config_tree) {
 }
 
 config_t *new_config(void) {
-	return xmalloc_and_zero(sizeof(config_t));
+	return xzalloc(sizeof(config_t));
 }
 
 void free_config(config_t *cfg) {
@@ -188,34 +175,6 @@ bool get_config_address(const config_t *cfg, struct addrinfo **result) {
 	return false;
 }
 
-bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
-	subnet_t subnet = {NULL};
-
-	if(!cfg)
-		return false;
-
-	if(!str2net(&subnet, cfg->value)) {
-		logger(DEBUG_ALWAYS, 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... */
-
-	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(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;
-	}
-
-	*(*result = new_subnet()) = subnet;
-
-	return true;
-}
-
 /*
   Read exactly one line and strip the trailing newline if any.
 */
@@ -265,19 +224,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(DEBUG_ALWAYS, LOG_ERR, "%s `%s' on line %d while reading config file %s",
-				err, variable, lineno, fname);
-		else
-			logger(DEBUG_ALWAYS, LOG_ERR, "%s `%s' in command line option %d",
-				err, variable, lineno);
+		logger(DEBUG_ALWAYS, LOG_ERR, "%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;
@@ -339,45 +294,15 @@ 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) {
-	size_t prefix_len = prefix ? strlen(prefix) : 0;
-
-	for(const list_node_t *node = cmdline_conf->tail; node; node = node->prev) {
-		const config_t *cfg = node->data;
-		config_t *new;
-
-		if(!prefix) {
-			if(strchr(cfg->variable, '.'))
-				continue;
-		} else {
-			if(strncmp(prefix, cfg->variable, prefix_len) ||
-			   cfg->variable[prefix_len] != '.')
-				continue;
-		}
-
-		new = new_config();
-		if(prefix)
-			new->variable = xstrdup(cfg->variable + prefix_len + 1);
-		else
-			new->variable = xstrdup(cfg->variable);
-		new->value = xstrdup(cfg->value);
-		new->file = NULL;
-		new->line = cfg->line;
-
-		config_add(config_tree, new);
-	}
-}
-
 bool read_server_config(void) {
 	char *fname;
 	bool x;
 
-	read_config_options(config_tree, NULL);
-
 	xasprintf(&fname, "%s" SLASH "tinc.conf", confbase);
+	errno = 0;
 	x = read_config_file(config_tree, fname);
 
-	if(!x)
+	if(!x && errno)
 		logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
 
 	free(fname);
@@ -389,8 +314,6 @@ bool read_host_config(splay_tree_t *config_tree, const char *name) {
 	char *fname;
 	bool x;
 
-	read_config_options(config_tree, name);
-
 	xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 	x = read_config_file(config_tree, fname);
 	free(fname);