X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=aa22c47ff9a67807e2721ba7d7671a3bcbfe7a0e;hb=656a7bca4fd4acac5c3411087a6ed62fa4b7fa81;hp=81d8359799ef3c7dc6d380a0709253a8d3feee6a;hpb=a86faaf34711d6b0f278b670d70a229a3cf0d479;p=meshlink diff --git a/src/conf.c b/src/conf.c index 81d83597..aa22c47f 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1,11 +1,6 @@ /* conf.c -- configuration code - Copyright (C) 1998 Robert van der Meulen - 1998-2005 Ivo Timmermans - 2000 Cris van Pelt - 2010-2011 Julien Muchembled - 2000-2013 Guus Sliepen - 2013 Florent Clairambault + 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 @@ -29,17 +24,12 @@ #include "conf.h" #include "list.h" #include "logger.h" +#include "meshlink_internal.h" #include "netutl.h" /* for str2address */ #include "protocol.h" #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 */ -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; @@ -48,11 +38,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) @@ -61,11 +46,11 @@ 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) { +void exit_configuration(splay_tree_t **config_tree) { splay_delete_tree(*config_tree); *config_tree = NULL; } @@ -235,19 +220,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; @@ -309,103 +290,41 @@ 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 read_server_config(meshlink_handle_t *mesh) { + char filename[PATH_MAX]; bool x; - //read_config_options(config_tree, NULL); - - xasprintf(&fname, "%s" SLASH "tinc.conf", confbase); + snprintf(filename, PATH_MAX,"%s" SLASH "meshlink.conf", mesh->confbase); errno = 0; - x = read_config_file(config_tree, fname); - - // We will try to read the conf files in the "conf.d" dir - if (x) { - char * dname; - xasprintf(&dname, "%s" SLASH "conf.d", confbase); - DIR *dir = opendir (dname); - // If we can find this dir - if (dir) { - struct dirent *ep; - // We list all the files in it - while (x && (ep = readdir (dir))) { - size_t l = strlen(ep->d_name); - // And we try to read the ones that end with ".conf" - if (l > 5 && !strcmp(".conf", & ep->d_name[ l - 5 ])) { - free(fname); - xasprintf(&fname, "%s" SLASH "%s", dname, ep->d_name); - x = read_config_file(config_tree, fname); - } - } - closedir (dir); - } - free(dname); - } + x = read_config_file(mesh->config, filename); if(!x && errno) - logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno)); - - free(fname); + logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", filename, strerror(errno)); return x; } -bool read_host_config(splay_tree_t *config_tree, const char *name) { - char *fname; +bool read_host_config(meshlink_handle_t *mesh, splay_tree_t *config_tree, const char *name) { + char filename[PATH_MAX]; 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); + snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); + x = read_config_file(config_tree, filename); return x; } -bool append_config_file(const char *name, const char *key, const char *value) { - char *fname; - xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name); +bool append_config_file(meshlink_handle_t *mesh, const char *name, const char *key, const char *value) { + char filename[PATH_MAX]; + snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); - FILE *fp = fopen(fname, "a"); + FILE *fp = fopen(filename, "a"); if(!fp) { - logger(DEBUG_ALWAYS, LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno)); + logger(DEBUG_ALWAYS, LOG_ERR, "Cannot open config file %s: %s", filename, strerror(errno)); } else { - fprintf(fp, "\n# The following line was automatically added by tinc\n%s = %s\n", key, value); fclose(fp); } - free(fname); - return fp != NULL; }