X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=e76262271703bf6d477b225934f3361c4a7468c7;hb=2200060c4eaadae36b8150aa33b0db7c0d74722f;hp=a1c0a3df600f80ecbaee2df8807b98396583495f;hpb=2a18ac20efd8ed3e1fd76f11f6f816e77c099e47;p=meshlink diff --git a/src/conf.c b/src/conf.c index a1c0a3df..e7626227 100644 --- a/src/conf.c +++ b/src/conf.c @@ -30,9 +30,6 @@ #include "utils.h" /* for cp */ #include "xalloc.h" -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; @@ -54,7 +51,8 @@ void init_configuration(splay_tree_t **config_tree) { } void exit_configuration(splay_tree_t **config_tree) { - splay_delete_tree(*config_tree); + if(*config_tree) + splay_delete_tree(*config_tree); *config_tree = NULL; } @@ -127,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; @@ -140,7 +138,7 @@ 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; @@ -168,7 +166,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; @@ -223,7 +221,7 @@ config_t *parse_config_line(char *line, const char *fname, int lineno) { if(!*value) { const char err[] = "No value for variable"; - logger(DEBUG_ALWAYS, LOG_ERR, "%s `%s' on line %d while reading config file %s", + logger(NULL, MESHLINK_ERROR, "%s `%s' on line %d while reading config file %s", err, variable, lineno, fname); return NULL; } @@ -253,7 +251,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; } @@ -293,47 +291,42 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) { return result; } -bool read_server_config(void) { - char *fname; +bool read_server_config(meshlink_handle_t *mesh) { + char filename[PATH_MAX]; bool x; - xasprintf(&fname, "%s" SLASH "tinc.conf", mesh->confbase); + snprintf(filename, PATH_MAX,"%s" SLASH "meshlink.conf", mesh->confbase); errno = 0; - x = read_config_file(mesh->config, fname); + 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; - xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", mesh->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", mesh->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(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; }