/*
conf.c -- configuration code
- Copyright (C) 1998 Robert van der Meulen
- 1998-2005 Ivo Timmermans
- 2000-2012 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 "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"
-splay_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;
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)
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;
}
config_t *new_config(void) {
- return xmalloc_and_zero(sizeof(config_t));
+ return xzalloc(sizeof(config_t));
}
void free_config(config_t *cfg) {
return false;
}
-bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
- subnet_t subnet = {NULL};
-
- if(!cfg)
- return false;
-
- if(!str2net(&subnet, cfg->value)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Subnet expected for configuration variable %s in %s line %d",
- cfg->variable, cfg->file, cfg->line);
- return false;
- }
-
- /* Teach newbies what subnets are... */
-
- if(((subnet.type == SUBNET_IPV4)
- && !maskcheck(&subnet.net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof subnet.net.ipv4.address))
- || ((subnet.type == SUBNET_IPV6)
- && !maskcheck(&subnet.net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof subnet.net.ipv6.address))) {
- logger(DEBUG_ALWAYS, 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;
- }
-
- *(*result = new_subnet()) = subnet;
-
- return true;
-}
-
/*
Read exactly one line and strip the trailing newline if any.
*/
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;
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(DEBUG_ALWAYS, LOG_ERR, "%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;
ignore = false;
continue;
}
-
+
if(!strncmp(line, "-----BEGIN", 10)) {
ignore = true;
continue;
return result;
}
-void read_config_options(splay_tree_t *config_tree, const char *prefix) {
- size_t prefix_len = prefix ? strlen(prefix) : 0;
-
- for(const list_node_t *node = cmdline_conf->tail; node; node = node->prev) {
- const config_t *cfg = node->data;
- config_t *new;
-
- if(!prefix) {
- if(strchr(cfg->variable, '.'))
- continue;
- } else {
- if(strncmp(prefix, cfg->variable, prefix_len) ||
- cfg->variable[prefix_len] != '.')
- continue;
- }
-
- 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;
-
- config_add(config_tree, new);
- }
-}
-
-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/tinc.conf", confbase);
- x = read_config_file(config_tree, fname);
-
- if(!x) { /* System error: complain */
- logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
- }
+ snprintf(filename, PATH_MAX,"%s" SLASH "meshlink.conf", mesh->confbase);
+ errno = 0;
+ x = read_config_file(mesh->config, filename);
- free(fname);
+ if(!x && errno)
+ logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", filename, strerror(errno));
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;
}
-bool append_config_file(const char *name, const char *key, const char *value) {
- char *fname;
- xasprintf(&fname, "%s/hosts/%s", 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(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);
+ fprintf(fp, "%s = %s\n", key, value);
fclose(fp);
}
-
- free(fname);
-
- return fp;
+ return fp != NULL;
}