/*
conf.c -- configuration code
- Copyright (C) 1998 Robert van der Meulen
- 1998-2005 Ivo Timmermans
- 2000-2009 Guus Sliepen <guus@tinc-vpn.org>
- 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 "splay_tree.h"
+#include "connection.h"
#include "conf.h"
+#include "list.h"
#include "logger.h"
-#include "netutl.h" /* for str2address */
-#include "utils.h" /* for cp */
+#include "meshlink_internal.h"
+#include "netutl.h" /* for str2address */
+#include "protocol.h"
+#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 */
-
static int config_compare(const config_t *a, const config_t *b) {
int result;
if(result)
return result;
else
- return strcmp(a->file, b->file);
+ 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) {
config_t cfg, *found;
cfg.variable = variable;
- cfg.file = "";
+ cfg.file = NULL;
cfg.line = 0;
found = splay_search_closest_greater(config_tree, &cfg);
return true;
}
- logger(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;
if(sscanf(cfg->value, "%d", result) == 1)
return true;
- logger(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;
}
+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;
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;
return true;
}
- logger(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;
}
-bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
- subnet_t subnet = {0};
-
- if(!cfg)
- return false;
-
- if(!str2net(&subnet, cfg->value)) {
- logger(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(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 the
- file was on EOF, return NULL. Otherwise, return all the data in a
- dynamically allocated buffer.
-
- If line is non-NULL, it will be used as an initial buffer, to avoid
- unnecessary mallocing each time this function is called. If buf is
- given, and buf needs to be expanded, the var pointed to by buflen
- will be increased.
+ 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;
- char *line; /* The array that contains everything that has been read so far */
- char *idx; /* Read into this pointer, which points to an offset within line */
- size_t size, newsize; /* The size of the current array pointed to by line */
- size_t maxlen; /* Maximum number of characters that may be read with fgets. This is newsize - oldsize. */
if(feof(fp))
return NULL;
- if(buf && buflen) {
- size = *buflen;
- line = *buf;
- } else {
- size = 100;
- line = xmalloc(size);
- }
+ p = fgets(buf, buflen, fp);
- maxlen = size;
- idx = line;
- *idx = 0;
+ if(!p)
+ return NULL;
- for(;;) {
- errno = 0;
- p = fgets(idx, maxlen, fp);
+ newline = strchr(p, '\n');
- if(!p) { /* EOF or error */
- if(feof(fp))
- break;
+ if(!newline)
+ return buf;
- /* otherwise: error; let the calling function print an error message if applicable */
- free(line);
- return NULL;
- }
+ /* kill newline and carriage return if necessary */
+ *newline = '\0';
+ if(newline > p && newline[-1] == '\r')
+ newline[-1] = '\0';
- newline = strchr(p, '\n');
-
- if(!newline) { /* We haven't yet read everything to the end of the line */
- newsize = size << 1;
- line = xrealloc(line, newsize);
- idx = &line[size - 1];
- maxlen = newsize - size + 1;
- size = newsize;
- } else {
- *newline = '\0'; /* kill newline */
- if(newline > p && newline[-1] == '\r') /* and carriage return if necessary */
- newline[-1] = '\0';
- break; /* yay */
- }
+ return buf;
+}
+
+config_t *parse_config_line(char *line, const char *fname, int lineno) {
+ config_t *cfg;
+ int len;
+ char *variable, *value, *eol;
+ variable = value = line;
+
+ eol = line + strlen(line);
+ 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(buf && buflen) {
- *buflen = size;
- *buf = line;
+ if(!*value) {
+ const char err[] = "No value for variable";
+ logger(NULL, MESHLINK_ERROR, "%s `%s' on line %d while reading config file %s",
+ err, variable, lineno, fname);
+ return NULL;
}
- return line;
+ cfg = new_config();
+ cfg->variable = xstrdup(variable);
+ cfg->value = xstrdup(value);
+ cfg->file = xstrdup(fname);
+ cfg->line = lineno;
+
+ return cfg;
}
/*
Parse a configuration file and put the results in the configuration tree
starting at *base.
*/
-int read_config_file(splay_tree_t *config_tree, const char *fname) {
- int err = -2; /* Parse error */
+bool read_config_file(splay_tree_t *config_tree, const char *fname) {
FILE *fp;
- char *buffer, *line;
- char *variable, *value, *eol;
+ char buffer[MAX_STRING_SIZE];
+ char *line;
int lineno = 0;
- int len;
bool ignore = false;
config_t *cfg;
- size_t bufsize;
+ bool result = false;
fp = fopen(fname, "r");
if(!fp) {
- logger(LOG_ERR, "Cannot open config file %s: %s", fname,
- strerror(errno));
- return -3;
+ logger(NULL, MESHLINK_ERROR, "Cannot open config file %s: %s", fname, strerror(errno));
+ return false;
}
- bufsize = 100;
- buffer = xmalloc(bufsize);
-
for(;;) {
- if(feof(fp)) {
- err = 0;
- break;
- }
-
- line = readline(fp, &buffer, &bufsize);
+ line = readline(fp, buffer, sizeof buffer);
if(!line) {
- err = -1;
+ if(feof(fp))
+ result = true;
break;
}
ignore = false;
continue;
}
-
+
if(!strncmp(line, "-----BEGIN", 10)) {
ignore = true;
continue;
}
- variable = value = line;
+ cfg = parse_config_line(line, fname, lineno);
+ if (!cfg)
+ break;
+ config_add(config_tree, cfg);
+ }
+
+ fclose(fp);
- eol = line + strlen(line);
- while(strchr("\t ", *--eol))
- *eol = '\0';
+ return result;
+}
- len = strcspn(value, "\t =");
- value += len;
- value += strspn(value, "\t ");
- if(*value == '=') {
- value++;
- value += strspn(value, "\t ");
+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)) {
+ logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+ return false;
}
- variable[len] = '\0';
-
- if(!*value) {
- logger(LOG_ERR, "No value for variable `%s' on line %d while reading config file %s",
- variable, lineno, fname);
- break;
+ if(fwrite(" = ", sizeof(char), 3, fp) < 3) {
+ logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+ return false;
}
- cfg = new_config();
- cfg->variable = xstrdup(variable);
- cfg->value = xstrdup(value);
- cfg->file = xstrdup(fname);
- cfg->line = lineno;
+ if(fwrite(cnf->value, sizeof(char), strlen(cnf->value), fp) < strlen(cnf->value)) {
+ logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+ return false;
+ }
- config_add(config_tree, cfg);
+ if(fwrite("\n", sizeof(char), 1, fp) < 1) {
+ logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+ return false;
+ }
}
- free(buffer);
fclose(fp);
- return err;
+ return true;
}
-bool read_server_config() {
- char *fname;
- int x;
+bool read_server_config(meshlink_handle_t *mesh) {
+ char filename[PATH_MAX];
+ bool x;
- xasprintf(&fname, "%s/tinc.conf", confbase);
- x = read_config_file(config_tree, fname);
+ snprintf(filename, PATH_MAX,"%s" SLASH "meshlink.conf", mesh->confbase);
+ errno = 0;
+ x = read_config_file(mesh->config, filename);
- if(x == -1) { /* 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));
+
+ return x;
+}
- free(fname);
+bool read_host_config(meshlink_handle_t *mesh, splay_tree_t *config_tree, const char *name) {
+ char filename[PATH_MAX];
+ bool x;
+
+ snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+ x = read_config_file(config_tree, filename);
+
+ return x;
+}
+
+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);
+ return write_config_file(config_tree, filename);
+}
+
+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(filename, "a");
+
+ if(!fp) {
+ logger(mesh, MESHLINK_ERROR, "Cannot open config file %s: %s", filename, strerror(errno));
+ } else {
+ fprintf(fp, "%s = %s\n", key, value);
+ fclose(fp);
+ }
- return x == 0;
+ return fp != NULL;
}