X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=207f6005cd97967bd3f1c03fc985cbe2fe3b4915;hb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;hp=f580a203d9275ce99e057deca263f4d1ea25ff29;hpb=1d9dacb1f26971e19463b5501c2410c57f780ecb;p=meshlink diff --git a/src/conf.c b/src/conf.c index f580a203..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 - 2010-2011 Julien Muchembled - 2000 Cris van Pelt + Copyright (C) 2014 Guus Sliepen 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 @@ -28,19 +24,15 @@ #include "conf.h" #include "list.h" #include "logger.h" -#include "netutl.h" /* for str2address */ +#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 */ - +int pinginterval = 0; /* seconds between pings */ +int pingtimeout = 0; /* seconds to wait for response */ 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. */ @@ -236,8 +195,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 +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; @@ -321,7 +277,7 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) { ignore = false; continue; } - + if(!strncmp(line, "-----BEGIN", 10)) { ignore = true; continue; @@ -338,63 +294,28 @@ 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; - - for(node = cmdline_conf->tail; node; node = next) { - config_t *orig_cfg, *cfg = (config_t *)node->data; - next = node->prev; - - 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); - } -} - bool read_server_config(void) { char *fname; bool x; - read_config_options(config_tree, NULL); - - xasprintf(&fname, "%s/tinc.conf", confbase); + xasprintf(&fname, "%s" SLASH "tinc.conf", confbase); + errno = 0; x = read_config_file(config_tree, fname); - if(!x) { /* System error: complain */ + if(!x && errno) logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno)); - } free(fname); return x; } -bool read_connection_config(connection_t *c) { +bool read_host_config(splay_tree_t *config_tree, const char *name) { char *fname; bool x; - read_config_options(c->config_tree, c->name); - - xasprintf(&fname, "%s/hosts/%s", confbase, c->name); - x = read_config_file(c->config_tree, fname); + xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name); + x = read_config_file(config_tree, fname); free(fname); return x; @@ -402,7 +323,7 @@ bool read_connection_config(connection_t *c) { bool append_config_file(const char *name, const char *key, const char *value) { char *fname; - xasprintf(&fname, "%s/hosts/%s", confbase, name); + xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name); FILE *fp = fopen(fname, "a"); @@ -413,8 +334,7 @@ bool append_config_file(const char *name, const char *key, const char *value) { fclose(fp); } - free(fname); - return fp; + return fp != NULL; }