X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=426f6dc41a74cd05dd507fd8fd087122dab9363f;hb=196806f90f40fcc0cf727abd4bed6bc5aefff5ff;hp=a1c0a3df600f80ecbaee2df8807b98396583495f;hpb=2a18ac20efd8ed3e1fd76f11f6f816e77c099e47;p=meshlink diff --git a/src/conf.c b/src/conf.c index a1c0a3df..426f6dc4 100644 --- a/src/conf.c +++ b/src/conf.c @@ -18,6 +18,7 @@ */ #include "system.h" +#include #include "splay_tree.h" #include "connection.h" @@ -30,9 +31,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 +52,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,8 +126,8 @@ 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", - cfg->variable, cfg->file, cfg->line); + 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,12 +139,27 @@ 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", - cfg->variable, cfg->file, cfg->line); + 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; @@ -155,6 +169,18 @@ 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; @@ -168,8 +194,8 @@ 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", - cfg->variable, cfg->file, cfg->line); + 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,8 +249,8 @@ 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", - err, variable, lineno, fname); + logger(NULL, MESHLINK_ERROR, "%s `%s' on line %d while reading config file %s", + err, variable, lineno, fname); return NULL; } @@ -253,7 +279,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; } @@ -283,7 +309,7 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) { } cfg = parse_config_line(line, fname, lineno); - if (!cfg) + if(!cfg) break; config_add(config_tree, cfg); } @@ -293,47 +319,174 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) { return result; } -bool read_server_config(void) { - char *fname; +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 splay_each(config_t, cnf, config_tree) { + if(fwrite(cnf->variable, sizeof(char), strlen(cnf->variable), fp) < strlen(cnf->variable)) + goto error; + + if(fwrite(" = ", sizeof(char), 3, fp) < 3) + goto error; + + 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(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 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); +} - 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); +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)); + + 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; } - free(fname); + FILE *fw = fopen(tmpname, "w"); + + if(!fw) { + logger(mesh, MESHLINK_ERROR, "Cannot open temporary file %s: %s", tmpname, strerror(errno)); + fclose(fr); + return false; + } + + 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); }