/*
conf.c -- configuration code
- Copyright (C) 1998 Robert van der Meulen
- 1998-2005 Ivo Timmermans
- 2000-2010 Guus Sliepen <guus@tinc-vpn.org>
- 2010-2011 Julien Muchembled <jm@jmuchemb.eu>
- 2000 Cris van Pelt
+ Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
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
*/
#include "system.h"
+#include <assert.h>
-#include "avl_tree.h"
+#include "splay_tree.h"
#include "connection.h"
#include "conf.h"
#include "list.h"
#include "logger.h"
-#include "netutl.h" /* for str2address */
+#include "meshlink_internal.h"
+#include "netutl.h" /* for str2address */
#include "protocol.h"
-#include "utils.h" /* for cp */
+#include "utils.h" /* for cp */
#include "xalloc.h"
-avl_tree_t *config_tree;
-
-int pinginterval = 0; /* seconds between pings */
-int pingtimeout = 0; /* seconds to wait for response */
-char *confbase = NULL; /* directory in which all config files are */
-char *netname = NULL; /* name of the vpn network */
-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;
result = strcasecmp(a->variable, b->variable);
- if(result)
- return result;
-
- /* give priority to command line options */
- result = !b->file - !a->file;
- 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(avl_tree_t ** config_tree) {
- *config_tree = avl_alloc_tree((avl_compare_t) config_compare, (avl_action_t) free_config);
+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(avl_tree_t ** config_tree) {
- avl_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) {
- 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);
}
-void config_add(avl_tree_t *config_tree, config_t *cfg) {
- avl_insert(config_tree, cfg);
+void config_add(splay_tree_t *config_tree, config_t *cfg) {
+ splay_insert(config_tree, cfg);
}
-config_t *lookup_config(const avl_tree_t *config_tree, char *variable) {
+config_t *lookup_config(splay_tree_t *config_tree, char *variable) {
config_t cfg, *found;
cfg.variable = variable;
- cfg.file = NULL;
cfg.line = 0;
- found = avl_search_closest_greater(config_tree, &cfg);
+ 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;
}
-config_t *lookup_config_next(const avl_tree_t *config_tree, const config_t *cfg) {
- avl_node_t *node;
+config_t *lookup_config_next(splay_tree_t *config_tree, const config_t *cfg) {
+ splay_node_t *node;
config_t *found;
- node = avl_search_node(config_tree, cfg);
+ node = splay_search_node(config_tree, cfg);
if(node) {
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(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(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 get_config_address(const config_t *cfg, struct addrinfo **result) {
- struct addrinfo *ai;
-
- if(!cfg)
+bool set_config_string(config_t *cfg, const char *val) {
+ if(!cfg) {
return false;
+ }
- ai = str2addrinfo(cfg->value, NULL, 0);
-
- if(ai) {
- *result = ai;
- return true;
+ if(cfg->value) {
+ free(cfg->value);
}
- logger(LOG_ERR, "Hostname or IP address expected for configuration variable %s in %s line %d",
- cfg->variable, cfg->file, cfg->line);
+ cfg->value = xstrdup(val);
- return false;
+ return true;
}
-bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
- subnet_t subnet = {NULL};
-
- if(!cfg)
- return false;
+bool get_config_address(const config_t *cfg, struct addrinfo **result) {
+ struct addrinfo *ai;
- if(!str2net(&subnet, cfg->value)) {
- logger(LOG_ERR, "Subnet expected for configuration variable %s in %s line %d",
- cfg->variable, cfg->file, cfg->line);
+ if(!cfg) {
return false;
}
- /* Teach newbies what subnets are... */
+ ai = str2addrinfo(cfg->value, NULL, 0);
- if(((subnet.type == SUBNET_IPV4)
- && !maskcheck(&subnet.net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(ipv4_t)))
- || ((subnet.type == SUBNET_IPV6)
- && !maskcheck(&subnet.net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(ipv6_t)))) {
- logger(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;
+ if(ai) {
+ *result = ai;
+ return true;
}
- *(*result = new_subnet()) = subnet;
+ logger(NULL, MESHLINK_ERROR, "Hostname or IP address expected for configuration variable %s in line %d",
+ cfg->variable, cfg->line);
- return true;
+ 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;
+ }
- *newline = '\0'; /* kill newline */
- if(newline > p && newline[-1] == '\r') /* and carriage return if necessary */
+ /* kill newline and carriage return if necessary */
+ *newline = '\0';
+
+ 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";
- if (fname)
- logger(LOG_ERR, "%s `%s' on line %d while reading config file %s",
- err, variable, lineno, fname);
- else
- logger(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->line = lineno;
return cfg;
Parse a configuration file and put the results in the configuration tree
starting at *base.
*/
-bool read_config_file(avl_tree_t *config_tree, const char *fname) {
+bool read_config_file(splay_tree_t *config_tree, const char *fname) {
FILE *fp;
char buffer[MAX_STRING_SIZE];
char *line;
fp = fopen(fname, "r");
if(!fp) {
- logger(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;
}
-
+
if(!strncmp(line, "-----BEGIN", 10)) {
ignore = true;
continue;
}
cfg = parse_config_line(line, fname, lineno);
- if (!cfg)
+
+ if(!cfg) {
break;
+ }
+
config_add(config_tree, cfg);
}
return result;
}
-void read_config_options(avl_tree_t *config_tree, const char *prefix) {
- list_node_t *node, *next;
- size_t prefix_len = prefix ? strlen(prefix) : 0;
-
- for(node = cmdline_conf->tail; node; node = next) {
- config_t *orig_cfg, *cfg = (config_t *)node->data;
- next = node->prev;
-
- if(!prefix) {
- if(strchr(cfg->variable, '.'))
- continue;
- node->data = NULL;
- list_unlink_node(cmdline_conf, node);
- } else {
- if(strncmp(prefix, cfg->variable, prefix_len) ||
- cfg->variable[prefix_len] != '.')
- continue;
- /* Because host configuration is parsed again when
- reconnecting, nodes must not be freed when a prefix
- is given. */
- orig_cfg = cfg;
- cfg = new_config();
- cfg->variable = xstrdup(orig_cfg->variable + prefix_len + 1);
- cfg->value = xstrdup(orig_cfg->value);
- cfg->file = NULL;
- cfg->line = orig_cfg->line;
+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;
}
- config_add(config_tree, cfg);
}
+
+ 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);
+ snprintf(filename, PATH_MAX, "%s" SLASH "meshlink.conf", mesh->confbase);
+ errno = 0;
+ x = read_config_file(mesh->config, filename);
- xasprintf(&fname, "%s/tinc.conf", confbase);
- x = read_config_file(config_tree, fname);
-
- if(!x) { /* System error: complain */
- logger(LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
+ if(!x && errno) {
+ logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", filename, strerror(errno));
}
- free(fname);
-
return x;
}
-bool read_connection_config(connection_t *c) {
- 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(c->config_tree, c->name);
-
- xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
- x = read_config_file(c->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;
}
-FILE *ask_and_open(const char *filename, const char *what) {
- FILE *r;
- char *directory;
- char line[PATH_MAX];
- const char *fn;
-
- /* Check stdin and stdout */
- if(!isatty(0) || !isatty(1)) {
- /* Argh, they are running us from a script or something. Write
- the files to the current directory and let them burn in hell
- for ever. */
- fn = filename;
- } else {
- /* Ask for a file and/or directory name. */
- fprintf(stdout, "Please enter a file to save %s to [%s]: ",
- what, filename);
- fflush(stdout);
+bool write_host_config(struct meshlink_handle *mesh, const struct splay_tree_t *config_tree, const char *name) {
+ char filename[PATH_MAX];
- fn = readline(stdin, line, sizeof line);
+ snprintf(filename, PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+ return write_config_file(config_tree, filename);
+}
- if(!fn) {
- fprintf(stderr, "Error while reading stdin: %s\n",
- strerror(errno));
- return NULL;
- }
+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(!strlen(fn))
- /* User just pressed enter. */
- fn = filename;
+ 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;
}
-#ifdef HAVE_MINGW
- if(fn[0] != '\\' && fn[0] != '/' && !strchr(fn, ':')) {
-#else
- if(fn[0] != '/') {
-#endif
- /* The directory is a relative path or a filename. */
- char *p;
+ 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");
- directory = get_current_dir_name();
- xasprintf(&p, "%s/%s", directory, fn);
- free(directory);
- fn = p;
+ if(!fr) {
+ logger(mesh, MESHLINK_ERROR, "Cannot open config file %s: %s", filename, strerror(errno));
+ return false;
}
- umask(0077); /* Disallow everything for group and other */
+ FILE *fw = fopen(tmpname, "w");
- /* Open it first to keep the inode busy */
+ if(!fw) {
+ logger(mesh, MESHLINK_ERROR, "Cannot open temporary file %s: %s", tmpname, strerror(errno));
+ fclose(fr);
+ return false;
+ }
- r = fopen(fn, "r+") ?: fopen(fn, "w+");
+ char buf[4096];
+ char *sep;
+ int found = 0;
- if(!r) {
- fprintf(stderr, "Error opening file `%s': %s\n",
- fn, strerror(errno));
- return NULL;
+ if(value) {
+ fprintf(fw, "%s = %s\n", key, value);
+ found++;
}
- return r;
-}
+ while(readline(fr, buf, sizeof(buf))) {
+ if(!*buf || *buf == '#') {
+ goto copy;
+ }
-bool disable_old_keys(FILE *f) {
- char buf[100];
- long pos;
- bool disabled = false;
+ sep = strchr(buf, ' ');
- rewind(f);
- pos = ftell(f);
+ if(!sep) {
+ goto copy;
+ }
- if(pos < 0)
- return false;
+ *sep = 0;
- while(fgets(buf, sizeof buf, f)) {
- if(!strncmp(buf, "-----BEGIN RSA", 14)) {
- buf[11] = 'O';
- buf[12] = 'L';
- buf[13] = 'D';
- if(fseek(f, pos, SEEK_SET))
- break;
- if(fputs(buf, f) <= 0)
- break;
- disabled = true;
+ if(strcmp(buf, key)) {
+ *sep = ' ';
+ goto copy;
}
- else if(!strncmp(buf, "-----END RSA", 12)) {
- buf[ 9] = 'O';
- buf[10] = 'L';
- buf[11] = 'D';
- if(fseek(f, pos, SEEK_SET))
- break;
- if(fputs(buf, f) <= 0)
- break;
- disabled = true;
+
+ // 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;
}
- pos = ftell(f);
- if(pos < 0)
- break;
+
+ // 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;
}
- return disabled;
+ 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