X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=ad4b28b89708e0db5378ac5ec8ef460295c04dce;hb=8c5bd53b91c720acf34d770e0f09d2b207b068eb;hp=c4f8abb8303f649eff8f9f96eeb751f3f015d357;hpb=cc3c69c892b0dad9a6ece0a0f4ccd429a22fcbff;p=meshlink diff --git a/src/conf.c b/src/conf.c index c4f8abb8..ad4b28b8 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-2013 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,18 +24,12 @@ #include "conf.h" #include "list.h" #include "logger.h" -#include "names.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,17 +46,18 @@ 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) { - splay_delete_tree(*config_tree); +void exit_configuration(splay_tree_t **config_tree) { + if(*config_tree) + splay_delete_tree(*config_tree); *config_tree = NULL; } config_t *new_config(void) { - return xmalloc_and_zero(sizeof(config_t)); + return xzalloc(sizeof(config_t)); } void free_config(config_t *cfg) { @@ -139,7 +125,7 @@ bool get_config_bool(const config_t *cfg, bool *result) { return true; } - logger(DEBUG_ALWAYS, LOG_ERR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d", + logger(NULL, MESHLINK_ERROR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d", cfg->variable, cfg->file, cfg->line); return false; @@ -152,12 +138,28 @@ bool get_config_int(const config_t *cfg, int *result) { if(sscanf(cfg->value, "%d", result) == 1) return true; - logger(DEBUG_ALWAYS, LOG_ERR, "Integer expected for configuration variable %s in %s line %d", + logger(NULL, MESHLINK_ERROR, "Integer expected for configuration variable %s in %s line %d", cfg->variable, cfg->file, cfg->line); return false; } +bool set_config_int(config_t *cfg, int val) +{ + if(!cfg) + return false; + + char val_str[1024]; + snprintf(val_str, sizeof(val_str), "%d", val); + + if(cfg->value) + free(cfg->value); + + cfg->value = xstrdup(val_str); + + return true; +} + bool get_config_string(const config_t *cfg, char **result) { if(!cfg) return false; @@ -167,6 +169,19 @@ bool get_config_string(const config_t *cfg, char **result) { return true; } +bool set_config_string(config_t *cfg, const char* val) +{ + if(!cfg) + return false; + + if(cfg->value) + free(cfg->value); + + cfg->value = xstrdup(val); + + return true; +} + bool get_config_address(const config_t *cfg, struct addrinfo **result) { struct addrinfo *ai; @@ -180,40 +195,12 @@ bool get_config_address(const config_t *cfg, struct addrinfo **result) { return true; } - logger(DEBUG_ALWAYS, LOG_ERR, "Hostname or IP address expected for configuration variable %s in %s line %d", + logger(NULL, MESHLINK_ERROR, "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 = {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. */ @@ -263,19 +250,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(NULL, MESHLINK_ERROR, "%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; @@ -297,7 +280,7 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) { fp = fopen(fname, "r"); if(!fp) { - logger(DEBUG_ALWAYS, LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno)); + logger(NULL, MESHLINK_ERROR, "Cannot open config file %s: %s", fname, strerror(errno)); return false; } @@ -337,79 +320,89 @@ 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; +bool write_config_file(const struct splay_tree_t *config_tree, const char *fname) +{ + FILE *fp; + + fp = fopen(fname, "w+"); + + if(!fp) { + logger(NULL, MESHLINK_ERROR, "Cannot open config file %s: %s", fname, strerror(errno)); + return false; + } - for(const list_node_t *node = cmdline_conf->tail; node; node = node->prev) { - const config_t *cfg = node->data; - config_t *new; + for splay_each(config_t, cnf, config_tree) + { + if(fwrite(cnf->variable, sizeof(char), strlen(cnf->variable), fp) < strlen(cnf->variable)) { + logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno)); + return false; + } - if(!prefix) { - if(strchr(cfg->variable, '.')) - continue; - } else { - if(strncmp(prefix, cfg->variable, prefix_len) || - cfg->variable[prefix_len] != '.') - continue; + if(fwrite(" = ", sizeof(char), 3, fp) < 3) { + logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno)); + return false; } - 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; + if(fwrite(cnf->value, sizeof(char), strlen(cnf->value), fp) < strlen(cnf->value)) { + logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno)); + return false; + } - config_add(config_tree, new); + if(fwrite("\n", sizeof(char), 1, fp) < 1) { + logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno)); + return false; + } } -} -bool read_server_config(void) { - char *fname; - bool x; + fclose(fp); - read_config_options(config_tree, NULL); + return true; +} - xasprintf(&fname, "%s" SLASH "tinc.conf", confbase); - x = read_config_file(config_tree, fname); +bool read_server_config(meshlink_handle_t *mesh) { + char filename[PATH_MAX]; + bool x; - if(!x) - logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno)); + snprintf(filename, PATH_MAX,"%s" SLASH "meshlink.conf", mesh->confbase); + errno = 0; + x = read_config_file(mesh->config, filename); - free(fname); + if(!x && errno) + logger(mesh, MESHLINK_ERROR, "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 write_host_config(struct meshlink_handle *mesh, const struct splay_tree_t *config_tree, const char *name) +{ + char filename[PATH_MAX]; - FILE *fp = fopen(fname, "a"); + snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); + return write_config_file(config_tree, filename); +} + +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(filename, "a"); if(!fp) { - logger(DEBUG_ALWAYS, LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno)); + logger(mesh, MESHLINK_ERROR, "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); + fprintf(fp, "%s = %s\n", key, value); fclose(fp); } - free(fname); - return fp != NULL; }