*/
#include "system.h"
+#include <assert.h>
#include "splay_tree.h"
#include "connection.h"
result = strcasecmp(a->variable, b->variable);
- if(result)
+ if(result) {
return result;
+ }
- result = a->line - b->line;
-
- if(result)
- return result;
- else
- return a->file ? strcmp(a->file, b->file) : 0;
+ return result = a->line - b->line;
}
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;
}
}
void free_config(config_t *cfg) {
- if(cfg->variable)
- free(cfg->variable);
-
- if(cfg->value)
- free(cfg->value);
-
- if(cfg->file)
- free(cfg->file);
-
+ free(cfg->variable);
+ free(cfg->value);
free(cfg);
}
config_t cfg, *found;
cfg.variable = variable;
- cfg.file = NULL;
cfg.line = 0;
found = splay_search_closest_greater(config_tree, &cfg);
- if(!found)
+ if(!found) {
return NULL;
+ }
- if(strcasecmp(found->variable, variable))
+ if(strcasecmp(found->variable, variable)) {
return NULL;
+ }
return found;
}
if(node->next) {
found = node->next->data;
- if(!strcasecmp(found->variable, cfg->variable))
+ if(!strcasecmp(found->variable, cfg->variable)) {
return found;
+ }
}
}
}
bool get_config_bool(const config_t *cfg, bool *result) {
- if(!cfg)
+ if(!cfg) {
return false;
+ }
if(!strcasecmp(cfg->value, "yes")) {
*result = true;
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 line %d",
+ cfg->variable, cfg->line);
return false;
}
bool get_config_int(const config_t *cfg, int *result) {
- if(!cfg)
+ if(!cfg) {
return false;
+ }
- if(sscanf(cfg->value, "%d", result) == 1)
+ 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 line %d",
+ cfg->variable, 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)
+ if(!cfg) {
return false;
+ }
*result = xstrdup(cfg->value);
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;
- if(!cfg)
+ if(!cfg) {
return false;
+ }
ai = str2addrinfo(cfg->value, NULL, 0);
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 line %d",
+ cfg->variable, cfg->line);
return false;
}
/*
Read exactly one line and strip the trailing newline if any.
*/
-static char *readline(FILE * fp, char *buf, size_t buflen) {
+static char *readline(FILE *fp, char *buf, size_t buflen) {
char *newline = NULL;
char *p;
- if(feof(fp))
+ if(feof(fp)) {
return NULL;
+ }
p = fgets(buf, buflen, fp);
- if(!p)
+ if(!p) {
return NULL;
+ }
newline = strchr(p, '\n');
- if(!newline)
+ if(!newline) {
return buf;
+ }
/* kill newline and carriage return if necessary */
*newline = '\0';
- if(newline > p && newline[-1] == '\r')
+
+ if(newline > p && newline[-1] == '\r') {
newline[-1] = '\0';
+ }
return buf;
}
variable = value = line;
eol = line + strlen(line);
- while(strchr("\t ", *--eol))
+
+ while(strchr("\t ", *--eol)) {
*eol = '\0';
+ }
len = strcspn(value, "\t =");
value += len;
value += strspn(value, "\t ");
+
if(*value == '=') {
value++;
value += strspn(value, "\t ");
}
+
variable[len] = '\0';
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;
}
cfg = new_config();
cfg->variable = xstrdup(variable);
cfg->value = xstrdup(value);
- cfg->file = xstrdup(fname);
cfg->line = lineno;
return cfg;
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;
}
for(;;) {
- line = readline(fp, buffer, sizeof buffer);
+ line = readline(fp, buffer, sizeof(buffer));
if(!line) {
- if(feof(fp))
+ if(feof(fp)) {
result = true;
+ }
+
break;
}
lineno++;
- if(!*line || *line == '#')
+ if(!*line || *line == '#') {
continue;
+ }
if(ignore) {
- if(!strncmp(line, "-----END", 8))
+ if(!strncmp(line, "-----END", 8)) {
ignore = false;
+ }
+
continue;
}
}
cfg = parse_config_line(line, fname, lineno);
- if (!cfg)
+
+ if(!cfg) {
break;
+ }
+
config_add(config_tree, cfg);
}
return result;
}
+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;
- snprintf(filename, PATH_MAX,"%s" SLASH "meshlink.conf", mesh->confbase);
+ snprintf(filename, PATH_MAX, "%s" SLASH "meshlink.conf", mesh->confbase);
errno = 0;
x = read_config_file(mesh->config, filename);
- if(!x && errno)
- logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", filename, strerror(errno));
+ if(!x && errno) {
+ logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", filename, strerror(errno));
+ }
return x;
}
char filename[PATH_MAX];
bool x;
- snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+ 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(meshlink_handle_t *mesh, const char *name, const char *key, const char *value) {
+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);
- FILE *fp = fopen(filename, "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", filename, 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, int trim) {
+ assert(mesh && name && key);
+
+ char filename[PATH_MAX];
+ char tmpname[PATH_MAX];
+ bool error = false;
+
+ if(snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name) >= PATH_MAX) {
+ logger(mesh, MESHLINK_ERROR, "Filename too long: %s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+ return false;
}
+ if(snprintf(tmpname, sizeof(tmpname), "%s.tmp", filename) >= PATH_MAX) {
+ logger(mesh, MESHLINK_ERROR, "Filename too long: %s.tmp", filename);
+ return false;
+ }
+
+ FILE *fr = fopen(filename, "r");
- return fp != NULL;
+ 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;
+ }
+
+ char buf[4096];
+ char *sep;
+ int found = 0;
+
+ if(value) {
+ fprintf(fw, "%s = %s\n", key, value);
+ found++;
+ }
+
+ 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;
+ }
+
+ // We found the key and the value. We already added it at the top, so ignore this one.
+ if(value && sep[1] == '=' && sep[2] == ' ' && !strcmp(sep + 3, value)) {
+ continue;
+ }
+
+ // We found the key but with a different value, delete it if wanted.
+ found++;
+
+ if((!value || trim) && found > trim) {
+ continue;
+ }
+
+ *sep = ' ';
+
+copy:
+ fprintf(fw, "%s\n", buf);
+ }
+
+ if(ferror(fr)) {
+ error = true;
+ }
+
+ fclose(fr);
+
+ 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;
+ }
+}
+
+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, 0);
}
projects / meshlink / blobdiff