X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=af8b0b0e20ba5e44a3c9953e5562577ef17eafd8;hb=adbe9a0c31825a0285e2a0e06558e1a5d8694005;hp=81d8359799ef3c7dc6d380a0709253a8d3feee6a;hpb=a86faaf34711d6b0f278b670d70a229a3cf0d479;p=meshlink diff --git a/src/conf.c b/src/conf.c index 81d83597..af8b0b0e 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 @@ -23,23 +18,19 @@ */ #include "system.h" +#include #include "splay_tree.h" #include "connection.h" #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 +39,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,12 +47,13 @@ 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; } @@ -139,7 +126,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 +139,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 +170,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,7 +196,7 @@ 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; @@ -235,19 +251,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; @@ -269,7 +281,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; } @@ -309,103 +321,177 @@ 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; - for(const list_node_t *node = cmdline_conf->tail; node; node = node->prev) { - const config_t *cfg = node->data; - config_t *new; + fp = fopen(fname, "w+"); - if(!prefix) { - if(strchr(cfg->variable, '.')) - continue; - } else { - if(strncmp(prefix, cfg->variable, prefix_len) || - cfg->variable[prefix_len] != '.') - continue; - } + if(!fp) { + logger(NULL, MESHLINK_ERROR, "Cannot open config file %s: %s", fname, strerror(errno)); + return false; + } + + for splay_each(config_t, cnf, config_tree) + { + if(fwrite(cnf->variable, sizeof(char), strlen(cnf->variable), fp) < strlen(cnf->variable)) + goto error; - 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(" = ", sizeof(char), 3, fp) < 3) + goto error; - config_add(config_tree, new); + if(fwrite(cnf->value, sizeof(char), strlen(cnf->value), fp) < strlen(cnf->value)) + goto error; + + if(fwrite("\n", sizeof(char), 1, fp) < 1) + goto error; } + + fclose(fp); + return true; + +error: + logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno)); + fclose(fp); + return false; } -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(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]; + + snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); + return write_config_file(config_tree, filename); +} - FILE *fp = fopen(fname, "a"); +bool modify_config_file(struct meshlink_handle *mesh, const char *name, const char *key, const char *value, bool replace) { + assert(mesh && name && key && (replace || value)); - if(!fp) { - logger(DEBUG_ALWAYS, LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno)); - } else { - fprintf(fp, "\n# The following line was automatically added by tinc\n%s = %s\n", key, value); - fclose(fp); + char filename[PATH_MAX]; + char tmpname[PATH_MAX]; + bool error = false; + + snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); + snprintf(tmpname, sizeof tmpname, "%s.tmp", filename); + + FILE *fr = fopen(filename, "r"); + + if(!fr) { + logger(mesh, MESHLINK_ERROR, "Cannot open config file %s: %s", filename, strerror(errno)); + return false; + } + + FILE *fw = fopen(tmpname, "w"); + + if(!fw) { + logger(mesh, MESHLINK_ERROR, "Cannot open temporary file %s: %s", tmpname, strerror(errno)); + fclose(fr); + return false; } - free(fname); + char buf[4096]; + char *sep; + bool found = false; + + while(readline(fr, buf, sizeof buf)) { + if(!*buf || *buf == '#') + goto copy; + + sep = strchr(buf, ' '); + if(!sep) + goto copy; + + *sep = 0; + if(strcmp(buf, key)) { + *sep = ' '; + goto copy; + } + + if(!value) { + found = true; + continue; + } + + // We found the key and the value. Keep one copy around. + if(sep[1] == '=' && sep[2] == ' ' && !strcmp(sep + 3, value)) { + if(found) + continue; + found = true; + } + + // We found the key but with a different value, delete it if wanted. + if(!found && replace) + continue; + + *sep = ' '; + +copy: + fprintf(fw, "%s\n", buf); + } + + if(ferror(fr)) + error = true; + + fclose(fr); + + // Add new key/value pair if necessary + if(!found && value) + fprintf(fw, "%s = %s\n", key, value); + + if(ferror(fw)) + error = true; + + if(fclose(fw)) + error = true; + + // If any error occured during reading or writing, exit. + if(error) { + unlink(tmpname); + return false; + } + + // Try to atomically replace the old config file with the new one. +#ifdef HAVE_MINGW + char bakname[PATH_MAX]; + snprintf(bakname, sizeof bakname, "%s.bak", filename); + if(rename(filename, bakname) || rename(tmpname, filename)) { + rename(bakname, filename); +#else + if(rename(tmpname, filename)) { +#endif + return false; + } else { +#ifdef HAVE_MINGW + unlink(bakname); +#endif + return true; + } +} - return fp != NULL; +bool append_config_file(meshlink_handle_t *mesh, const char *name, const char *key, const char *value) { + return modify_config_file(mesh, name, key, value, false); }