X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=7cf923bc88b087c1c9da0821146780a305977379;hb=4c57e6902219ecca1872e18e34365d8e54a0f407;hp=fcaefdd27ff8a122fff0b0fa70dc127cb1666f91;hpb=b67296418c51784d39a24c3041e2cb199bee06f2;p=meshlink

diff --git a/src/conf.c b/src/conf.c
index fcaefdd2..7cf923bc 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,6 +1,6 @@
 /*
-    conf.c -- configuration code
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    econf.c -- configuration code
+    Copyright (C) 2018 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
@@ -19,521 +19,1020 @@
 
 #include "system.h"
 #include <assert.h>
+#include <sys/types.h>
+#include <utime.h>
 
-#include "splay_tree.h"
-#include "connection.h"
 #include "conf.h"
-#include "list.h"
+#include "crypto.h"
 #include "logger.h"
 #include "meshlink_internal.h"
-#include "netutl.h"             /* for str2address */
-#include "protocol.h"
-#include "utils.h"              /* for cp */
 #include "xalloc.h"
+#include "packmsg.h"
 
-static int config_compare(const config_t *a, const config_t *b) {
-	int result;
+/// Generate a path to the main configuration file.
+static void make_main_path(meshlink_handle_t *mesh, const char *conf_subdir, char *path, size_t len) {
+	assert(conf_subdir);
+	assert(path);
+	assert(len);
 
-	result = strcasecmp(a->variable, b->variable);
+	snprintf(path, len, "%s" SLASH "%s" SLASH "meshlink.conf", mesh->confbase, conf_subdir);
+}
 
-	if(result) {
-		return result;
-	}
+/// Generate a path to a host configuration file.
+static void make_host_path(meshlink_handle_t *mesh, const char *conf_subdir, const char *name, char *path, size_t len) {
+	assert(conf_subdir);
+	assert(name);
+	assert(path);
+	assert(len);
 
-	result = a->line - b->line;
+	snprintf(path, len, "%s" SLASH "%s" SLASH "hosts" SLASH "%s", mesh->confbase, conf_subdir, name);
+}
 
-	if(result) {
-		return result;
-	} else {
-		return a->file ? strcmp(a->file, b->file) : 0;
-	}
+/// Generate a path to an unused invitation file.
+static void make_invitation_path(meshlink_handle_t *mesh, const char *conf_subdir, const char *name, char *path, size_t len) {
+	assert(conf_subdir);
+	assert(name);
+	assert(path);
+	assert(len);
+
+	snprintf(path, len, "%s" SLASH "%s" SLASH "invitations" SLASH "%s", mesh->confbase, conf_subdir, name);
 }
 
-void init_configuration(splay_tree_t **config_tree) {
-	*config_tree = splay_alloc_tree((splay_compare_t) config_compare, (splay_action_t) free_config);
+/// Generate a path to a used invitation file.
+static void make_used_invitation_path(meshlink_handle_t *mesh, const char *conf_subdir, const char *name, char *path, size_t len) {
+	assert(conf_subdir);
+	assert(name);
+	assert(path);
+	assert(len);
+
+	snprintf(path, len, "%s" SLASH "%s" SLASH "invitations" SLASH "%s.used", mesh->confbase, conf_subdir, name);
 }
 
-void exit_configuration(splay_tree_t **config_tree) {
-	if(*config_tree) {
-		splay_delete_tree(*config_tree);
+/// Remove a directory recursively
+static bool deltree(const char *dirname) {
+	assert(dirname);
+
+	DIR *d = opendir(dirname);
+
+	if(d) {
+		struct dirent *ent;
+
+		while((ent = readdir(d))) {
+			if(ent->d_name[0] == '.') {
+				continue;
+			}
+
+			char filename[PATH_MAX];
+			snprintf(filename, sizeof(filename), "%s" SLASH "%s", dirname, ent->d_name);
+
+			if(unlink(filename)) {
+				if(!deltree(filename)) {
+					return false;
+				}
+			}
+		}
+
+		closedir(d);
+	} else {
+		return errno == ENOENT;
 	}
 
-	*config_tree = NULL;
+	return rmdir(dirname) == 0;
 }
 
-config_t *new_config(void) {
-	return xzalloc(sizeof(config_t));
-}
+bool sync_path(const char *pathname) {
+	assert(pathname);
 
-void free_config(config_t *cfg) {
-	if(cfg->variable) {
-		free(cfg->variable);
+	int fd = open(pathname, O_RDONLY);
+
+	if(fd < 0) {
+		logger(NULL, MESHLINK_ERROR, "Failed to open %s: %s\n", pathname, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
 	}
 
-	if(cfg->value) {
-		free(cfg->value);
+	if(fsync(fd)) {
+		logger(NULL, MESHLINK_ERROR, "Failed to sync %s: %s\n", pathname, strerror(errno));
+		close(fd);
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
 	}
 
-	if(cfg->file) {
-		free(cfg->file);
+	if(close(fd)) {
+		logger(NULL, MESHLINK_ERROR, "Failed to close %s: %s\n", pathname, strerror(errno));
+		close(fd);
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
 	}
 
-	free(cfg);
+	return true;
 }
 
-void config_add(splay_tree_t *config_tree, config_t *cfg) {
-	splay_insert(config_tree, cfg);
+/// Try decrypting the main configuration file from the given sub-directory.
+static bool main_config_decrypt(meshlink_handle_t *mesh, const char *conf_subdir) {
+	assert(mesh->config_key);
+	assert(mesh->confbase);
+	assert(conf_subdir);
+
+	config_t config;
+
+	if(!main_config_read(mesh, conf_subdir, &config, mesh->config_key)) {
+		logger(mesh, MESHLINK_ERROR, "Could not read main configuration file");
+		return false;
+	}
+
+	packmsg_input_t in = {config.buf, config.len};
+
+	uint32_t version = packmsg_get_uint32(&in);
+	config_free(&config);
+
+	return version == MESHLINK_CONFIG_VERSION;
 }
 
-config_t *lookup_config(splay_tree_t *config_tree, char *variable) {
-	config_t cfg, *found;
+/// Create a fresh configuration directory
+bool config_init(meshlink_handle_t *mesh, const char *conf_subdir) {
+	assert(conf_subdir);
 
-	cfg.variable = variable;
-	cfg.file = NULL;
-	cfg.line = 0;
+	if(!mesh->confbase) {
+		return true;
+	}
 
-	found = splay_search_closest_greater(config_tree, &cfg);
+	char path[PATH_MAX];
 
-	if(!found) {
-		return NULL;
+	// Create "current" sub-directory in the confbase
+	snprintf(path, sizeof(path), "%s" SLASH "%s", mesh->confbase, conf_subdir);
+
+	if(!deltree(path)) {
+		logger(mesh, MESHLINK_DEBUG, "Could not delete directory %s: %s\n", path, strerror(errno));
+		return false;
 	}
 
-	if(strcasecmp(found->variable, variable)) {
-		return NULL;
+	if(mkdir(path, 0700)) {
+		logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", path, strerror(errno));
+		return false;
+	}
+
+	make_host_path(mesh, conf_subdir, "", path, sizeof(path));
+
+	if(mkdir(path, 0700)) {
+		logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", path, strerror(errno));
+		return false;
+	}
+
+	make_invitation_path(mesh, conf_subdir, "", path, sizeof(path));
+
+	if(mkdir(path, 0700)) {
+		logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", path, strerror(errno));
+		return false;
 	}
 
-	return found;
+	return true;
 }
 
-config_t *lookup_config_next(splay_tree_t *config_tree, const config_t *cfg) {
-	splay_node_t *node;
-	config_t *found;
+/// Wipe an existing configuration directory
+bool config_destroy(const char *confbase, const char *conf_subdir) {
+	assert(conf_subdir);
 
-	node = splay_search_node(config_tree, cfg);
+	if(!confbase) {
+		return true;
+	}
 
-	if(node) {
-		if(node->next) {
-			found = node->next->data;
+	struct stat st;
 
-			if(!strcasecmp(found->variable, cfg->variable)) {
-				return found;
-			}
+	char path[PATH_MAX];
+
+	// Check the presence of configuration base sub directory.
+	snprintf(path, sizeof(path), "%s" SLASH "%s", confbase, conf_subdir);
+
+	if(stat(path, &st)) {
+		if(errno == ENOENT) {
+			return true;
+		} else {
+			logger(NULL, MESHLINK_ERROR, "Cannot stat %s: %s\n", path, strerror(errno));
+			meshlink_errno = MESHLINK_ESTORAGE;
+			return false;
 		}
 	}
 
-	return NULL;
-}
+	// Remove meshlink.conf
+	snprintf(path, sizeof(path), "%s" SLASH "%s" SLASH "meshlink.conf", confbase, conf_subdir);
 
-bool get_config_bool(const config_t *cfg, bool *result) {
-	if(!cfg) {
-		return false;
+	if(unlink(path)) {
+		if(errno != ENOENT) {
+			logger(NULL, MESHLINK_ERROR, "Cannot delete %s: %s\n", path, strerror(errno));
+			meshlink_errno = MESHLINK_ESTORAGE;
+			return false;
+		}
 	}
 
-	if(!strcasecmp(cfg->value, "yes")) {
-		*result = true;
-		return true;
-	} else if(!strcasecmp(cfg->value, "no")) {
-		*result = false;
-		return true;
-	}
+	snprintf(path, sizeof(path), "%s" SLASH "%s", confbase, conf_subdir);
 
-	logger(NULL, MESHLINK_ERROR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d",
-	       cfg->variable, cfg->file, cfg->line);
+	if(!deltree(path)) {
+		logger(NULL, MESHLINK_ERROR, "Cannot delete %s: %s\n", path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
 
-	return false;
+	return sync_path(confbase);
 }
 
-bool get_config_int(const config_t *cfg, int *result) {
-	if(!cfg) {
+static bool copytree(const char *src_dir_name, const void *src_key, const char *dst_dir_name, const void *dst_key) {
+	assert(src_dir_name);
+	assert(dst_dir_name);
+
+	char src_filename[PATH_MAX];
+	char dst_filename[PATH_MAX];
+	struct dirent *ent;
+
+	DIR *src_dir = opendir(src_dir_name);
+
+	if(!src_dir) {
+		logger(NULL, MESHLINK_ERROR, "Could not open directory file %s\n", src_dir_name);
+		meshlink_errno = MESHLINK_ESTORAGE;
 		return false;
 	}
 
-	if(sscanf(cfg->value, "%d", result) == 1) {
-		return true;
+	// Delete if already exists and create a new destination directory
+	if(!deltree(dst_dir_name)) {
+		logger(NULL, MESHLINK_ERROR, "Cannot delete %s: %s\n", dst_dir_name, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
 	}
 
-	logger(NULL, MESHLINK_ERROR, "Integer expected for configuration variable %s in %s line %d",
-	       cfg->variable, cfg->file, cfg->line);
+	if(mkdir(dst_dir_name, 0700)) {
+		logger(NULL, MESHLINK_ERROR, "Could not create directory %s\n", dst_filename);
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
+
+	while((ent = readdir(src_dir))) {
+		if(ent->d_name[0] == '.') {
+			continue;
+		}
+
+		snprintf(dst_filename, sizeof(dst_filename), "%s" SLASH "%s", dst_dir_name, ent->d_name);
+		snprintf(src_filename, sizeof(src_filename), "%s" SLASH "%s", src_dir_name, ent->d_name);
+
+		if(ent->d_type == DT_DIR) {
+			if(!copytree(src_filename, src_key, dst_filename, dst_key)) {
+				logger(NULL, MESHLINK_ERROR, "Copying %s to %s failed\n", src_filename, dst_filename);
+				meshlink_errno = MESHLINK_ESTORAGE;
+				return false;
+			}
+
+			if(!sync_path(dst_filename)) {
+				return false;
+			}
+		} else if(ent->d_type == DT_REG) {
+			struct stat st;
+			config_t config;
+
+			if(stat(src_filename, &st)) {
+				logger(NULL, MESHLINK_ERROR, "Could not stat file `%s': %s\n", src_filename, strerror(errno));
+				meshlink_errno = MESHLINK_ESTORAGE;
+				return false;
+			}
+
+			FILE *f = fopen(src_filename, "r");
+
+			if(!f) {
+				logger(NULL, MESHLINK_ERROR, "Failed to open `%s': %s\n", src_filename, strerror(errno));
+				meshlink_errno = MESHLINK_ESTORAGE;
+				return false;
+			}
 
-	return false;
+			if(!config_read_file(NULL, f, &config, src_key)) {
+				logger(NULL, MESHLINK_ERROR, "Failed to read `%s': %s\n", src_filename, strerror(errno));
+				fclose(f);
+				meshlink_errno = MESHLINK_ESTORAGE;
+				return false;
+			}
+
+			if(fclose(f)) {
+				logger(NULL, MESHLINK_ERROR, "Failed to close `%s': %s\n", src_filename, strerror(errno));
+				config_free(&config);
+				meshlink_errno = MESHLINK_ESTORAGE;
+				return false;
+			}
+
+			f = fopen(dst_filename, "w");
+
+			if(!f) {
+				logger(NULL, MESHLINK_ERROR, "Failed to open `%s': %s", dst_filename, strerror(errno));
+				config_free(&config);
+				meshlink_errno = MESHLINK_ESTORAGE;
+				return false;
+			}
+
+			if(!config_write_file(NULL, f, &config, dst_key)) {
+				logger(NULL, MESHLINK_ERROR, "Failed to write `%s': %s", dst_filename, strerror(errno));
+				config_free(&config);
+				fclose(f);
+				meshlink_errno = MESHLINK_ESTORAGE;
+				return false;
+			}
+
+			if(fclose(f)) {
+				logger(NULL, MESHLINK_ERROR, "Failed to close `%s': %s", dst_filename, strerror(errno));
+				config_free(&config);
+				meshlink_errno = MESHLINK_ESTORAGE;
+				return false;
+			}
+
+			config_free(&config);
+
+			struct utimbuf times;
+			times.modtime = st.st_mtime;
+			times.actime = st.st_atime;
+
+			if(utime(dst_filename, &times)) {
+				logger(NULL, MESHLINK_ERROR, "Failed to utime `%s': %s", dst_filename, strerror(errno));
+				meshlink_errno = MESHLINK_ESTORAGE;
+				return false;
+			}
+		}
+	}
+
+	closedir(src_dir);
+	return true;
 }
 
-bool set_config_int(config_t *cfg, int val) {
-	if(!cfg) {
+bool config_copy(meshlink_handle_t *mesh, const char *src_dir_name, const void *src_key, const char *dst_dir_name, const void *dst_key) {
+	assert(src_dir_name);
+	assert(dst_dir_name);
+
+	char src_filename[PATH_MAX];
+	char dst_filename[PATH_MAX];
+
+	snprintf(dst_filename, sizeof(dst_filename), "%s" SLASH "%s", mesh->confbase, dst_dir_name);
+	snprintf(src_filename, sizeof(src_filename), "%s" SLASH "%s", mesh->confbase, src_dir_name);
+
+	return copytree(src_filename, src_key, dst_filename, dst_key);
+}
+
+/// Check the presence of the main configuration file.
+bool main_config_exists(meshlink_handle_t *mesh, const char *conf_subdir) {
+	assert(conf_subdir);
+
+	if(!mesh->confbase) {
 		return false;
 	}
 
-	char val_str[1024];
-	snprintf(val_str, sizeof(val_str), "%d", val);
+	char path[PATH_MAX];
+	make_main_path(mesh, conf_subdir, path, sizeof(path));
+	return access(path, F_OK) == 0;
+}
+
+bool config_rename(meshlink_handle_t *mesh, const char *old_conf_subdir, const char *new_conf_subdir) {
+	assert(old_conf_subdir);
+	assert(new_conf_subdir);
 
-	if(cfg->value) {
-		free(cfg->value);
+	if(!mesh->confbase) {
+		return false;
 	}
 
-	cfg->value = xstrdup(val_str);
+	char old_path[PATH_MAX];
+	char new_path[PATH_MAX];
 
-	return true;
+	snprintf(old_path, sizeof(old_path), "%s" SLASH "%s", mesh->confbase, old_conf_subdir);
+	snprintf(new_path, sizeof(new_path), "%s" SLASH "%s", mesh->confbase, new_conf_subdir);
+
+	return rename(old_path, new_path) == 0 && sync_path(mesh->confbase);
 }
 
-bool get_config_string(const config_t *cfg, char **result) {
-	if(!cfg) {
+bool config_sync(meshlink_handle_t *mesh, const char *conf_subdir) {
+	assert(conf_subdir);
+
+	if(!mesh->confbase) {
+		return true;
+	}
+
+	char path[PATH_MAX];
+	snprintf(path, sizeof(path), "%s" SLASH "%s" SLASH "hosts", mesh->confbase, conf_subdir);
+
+	if(!sync_path(path)) {
 		return false;
 	}
 
-	*result = xstrdup(cfg->value);
+	snprintf(path, sizeof(path), "%s" SLASH "%s", mesh->confbase, conf_subdir);
+
+	if(!sync_path(path)) {
+		return false;
+	}
 
 	return true;
 }
 
-bool set_config_string(config_t *cfg, const char *val) {
-	if(!cfg) {
+bool meshlink_confbase_exists(meshlink_handle_t *mesh) {
+	if(!mesh->confbase) {
 		return false;
 	}
 
-	if(cfg->value) {
-		free(cfg->value);
+	bool confbase_exists = false;
+	bool confbase_decryptable = false;
+
+	if(main_config_exists(mesh, "current")) {
+		confbase_exists = true;
+
+		if(mesh->config_key && main_config_decrypt(mesh, "current")) {
+			confbase_decryptable = true;
+		}
 	}
 
-	cfg->value = xstrdup(val);
+	if(mesh->config_key && !confbase_decryptable && main_config_exists(mesh, "new")) {
+		confbase_exists = true;
 
-	return true;
-}
+		if(main_config_decrypt(mesh, "new")) {
+			if(!config_destroy(mesh->confbase, "current")) {
+				return false;
+			}
 
-bool get_config_address(const config_t *cfg, struct addrinfo **result) {
-	struct addrinfo *ai;
+			if(!config_rename(mesh, "new", "current")) {
+				return false;
+			}
 
-	if(!cfg) {
-		return false;
+			confbase_decryptable = true;
+		}
 	}
 
-	ai = str2addrinfo(cfg->value, NULL, 0);
+	if(mesh->config_key && !confbase_decryptable && main_config_exists(mesh, "old")) {
+		confbase_exists = true;
 
-	if(ai) {
-		*result = ai;
-		return true;
+		if(main_config_decrypt(mesh, "old")) {
+			if(!config_destroy(mesh->confbase, "current")) {
+				return false;
+			}
+
+			if(!config_rename(mesh, "old", "current")) {
+				return false;
+			}
+
+			confbase_decryptable = true;
+		}
 	}
 
-	logger(NULL, MESHLINK_ERROR, "Hostname or IP address expected for configuration variable %s in %s line %d",
-	       cfg->variable, cfg->file, cfg->line);
+	// Cleanup if current is existing with old and new
+	if(confbase_exists && confbase_decryptable) {
+		if(!config_destroy(mesh->confbase, "old") || !config_destroy(mesh->confbase, "new")) {
+			return false;
+		}
+	}
 
-	return false;
+	return confbase_exists;
 }
 
-/*
-  Read exactly one line and strip the trailing newline if any.
-*/
-static char *readline(FILE *fp, char *buf, size_t buflen) {
-	char *newline = NULL;
-	char *p;
+/// Lock the main configuration file. Creates confbase if necessary.
+bool main_config_lock(meshlink_handle_t *mesh) {
+	if(!mesh->confbase) {
+		return true;
+	}
 
-	if(feof(fp)) {
+	if(mkdir(mesh->confbase, 0700) && errno != EEXIST) {
+		logger(NULL, MESHLINK_ERROR, "Cannot create configuration directory %s: %s", mesh->confbase, strerror(errno));
+		meshlink_close(mesh);
+		meshlink_errno = MESHLINK_ESTORAGE;
 		return NULL;
 	}
 
-	p = fgets(buf, buflen, fp);
+	char path[PATH_MAX];
+	snprintf(path, sizeof(path), "%s" SLASH "meshlink.lock", mesh->confbase);
 
-	if(!p) {
-		return NULL;
+	mesh->lockfile = fopen(path, "w+");
+
+	if(!mesh->lockfile) {
+		logger(NULL, MESHLINK_ERROR, "Cannot not open %s: %s\n", path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
 	}
 
-	newline = strchr(p, '\n');
+#ifdef FD_CLOEXEC
+	fcntl(fileno(mesh->lockfile), F_SETFD, FD_CLOEXEC);
+#endif
+
+#ifdef HAVE_MINGW
+	// TODO: use _locking()?
+#else
 
-	if(!newline) {
-		return buf;
+	if(flock(fileno(mesh->lockfile), LOCK_EX | LOCK_NB) != 0) {
+		logger(NULL, MESHLINK_ERROR, "Cannot lock %s: %s\n", path, strerror(errno));
+		fclose(mesh->lockfile);
+		mesh->lockfile = NULL;
+		meshlink_errno = MESHLINK_EBUSY;
+		return false;
 	}
 
-	/* kill newline and carriage return if necessary */
-	*newline = '\0';
+#endif
 
-	if(newline > p && newline[-1] == '\r') {
-		newline[-1] = '\0';
-	}
+	return true;
+}
 
-	return buf;
+/// Unlock the main configuration file.
+void main_config_unlock(meshlink_handle_t *mesh) {
+	if(mesh->lockfile) {
+		fclose(mesh->lockfile);
+		mesh->lockfile = NULL;
+	}
 }
 
-config_t *parse_config_line(char *line, const char *fname, int lineno) {
-	config_t *cfg;
-	int len;
-	char *variable, *value, *eol;
-	variable = value = line;
+/// Read a configuration file from a FILE handle.
+bool config_read_file(meshlink_handle_t *mesh, FILE *f, config_t *config, const void *key) {
+	assert(f);
 
-	eol = line + strlen(line);
+	long len;
 
-	while(strchr("\t ", *--eol)) {
-		*eol = '\0';
+	if(fseek(f, 0, SEEK_END) || !(len = ftell(f)) || fseek(f, 0, SEEK_SET)) {
+		logger(mesh, MESHLINK_ERROR, "Cannot get config file size: %s\n", strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
 	}
 
-	len = strcspn(value, "\t =");
-	value += len;
-	value += strspn(value, "\t ");
+	uint8_t *buf = xmalloc(len);
 
-	if(*value == '=') {
-		value++;
-		value += strspn(value, "\t ");
+	if(fread(buf, len, 1, f) != 1) {
+		logger(mesh, MESHLINK_ERROR, "Cannot read config file: %s\n", strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
 	}
 
-	variable[len] = '\0';
-
-	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;
+	if(key) {
+		uint8_t *decrypted = xmalloc(len);
+		size_t decrypted_len = len;
+		chacha_poly1305_ctx_t *ctx = chacha_poly1305_init();
+		chacha_poly1305_set_key(ctx, key);
+
+		if(len > 12 && chacha_poly1305_decrypt_iv96(ctx, buf, buf + 12, len - 12, decrypted, &decrypted_len)) {
+			chacha_poly1305_exit(ctx);
+			free(buf);
+			config->buf = decrypted;
+			config->len = decrypted_len;
+			return true;
+		} else {
+			logger(mesh, MESHLINK_ERROR, "Cannot decrypt config file\n");
+			meshlink_errno = MESHLINK_ESTORAGE;
+			chacha_poly1305_exit(ctx);
+			free(decrypted);
+			free(buf);
+			return false;
+		}
 	}
 
-	cfg = new_config();
-	cfg->variable = xstrdup(variable);
-	cfg->value = xstrdup(value);
-	cfg->file = xstrdup(fname);
-	cfg->line = lineno;
+	config->buf = buf;
+	config->len = len;
 
-	return cfg;
+	return true;
 }
 
-/*
-  Parse a configuration file and put the results in the configuration tree
-  starting at *base.
-*/
-bool read_config_file(splay_tree_t *config_tree, const char *fname) {
-	FILE *fp;
-	char buffer[MAX_STRING_SIZE];
-	char *line;
-	int lineno = 0;
-	bool ignore = false;
-	config_t *cfg;
-	bool result = false;
-
-	fp = fopen(fname, "r");
+/// Write a configuration file to a FILE handle.
+bool config_write_file(meshlink_handle_t *mesh, FILE *f, const config_t *config, const void *key) {
+	assert(f);
 
-	if(!fp) {
-		logger(NULL, MESHLINK_ERROR, "Cannot open config file %s: %s", fname, strerror(errno));
-		return false;
-	}
+	if(key) {
+		uint8_t buf[config->len + 16];
+		size_t len = sizeof(buf);
+		uint8_t seqbuf[12];
+		randomize(&seqbuf, sizeof(seqbuf));
+		chacha_poly1305_ctx_t *ctx = chacha_poly1305_init();
+		chacha_poly1305_set_key(ctx, key);
+		bool success = false;
 
-	for(;;) {
-		line = readline(fp, buffer, sizeof(buffer));
+		if(chacha_poly1305_encrypt_iv96(ctx, seqbuf, config->buf, config->len, buf, &len)) {
+			success = fwrite(seqbuf, sizeof(seqbuf), 1, f) == 1 && fwrite(buf, len, 1, f) == 1;
 
-		if(!line) {
-			if(feof(fp)) {
-				result = true;
+			if(!success) {
+				logger(mesh, MESHLINK_ERROR, "Cannot write config file: %s", strerror(errno));
 			}
 
-			break;
+			meshlink_errno = MESHLINK_ESTORAGE;
+		} else {
+			logger(mesh, MESHLINK_ERROR, "Cannot encrypt config file\n");
+			meshlink_errno = MESHLINK_ESTORAGE;
 		}
 
-		lineno++;
+		chacha_poly1305_exit(ctx);
+		return success;
+	}
 
-		if(!*line || *line == '#') {
-			continue;
-		}
+	if(fwrite(config->buf, config->len, 1, f) != 1) {
+		logger(mesh, MESHLINK_ERROR, "Cannot write config file: %s", strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
 
-		if(ignore) {
-			if(!strncmp(line, "-----END", 8)) {
-				ignore = false;
-			}
+	if(fflush(f)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to flush file: %s", strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
 
-			continue;
-		}
+	if(fsync(fileno(f))) {
+		logger(mesh, MESHLINK_ERROR, "Failed to sync file: %s\n", strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
 
-		if(!strncmp(line, "-----BEGIN", 10)) {
-			ignore = true;
-			continue;
-		}
+	return true;
+}
 
-		cfg = parse_config_line(line, fname, lineno);
+/// Free resources of a loaded configuration file.
+void config_free(config_t *config) {
+	assert(!config->len || config->buf);
 
-		if(!cfg) {
-			break;
-		}
+	free((uint8_t *)config->buf);
+	config->buf = NULL;
+	config->len = 0;
+}
 
-		config_add(config_tree, cfg);
+/// Check the presence of a host configuration file.
+bool config_exists(meshlink_handle_t *mesh, const char *conf_subdir, const char *name) {
+	assert(conf_subdir);
+
+	if(!mesh->confbase) {
+		return false;
 	}
 
-	fclose(fp);
+	char path[PATH_MAX];
+	make_host_path(mesh, conf_subdir, name, path, sizeof(path));
 
-	return result;
+	return access(path, F_OK) == 0;
 }
 
-bool write_config_file(const struct splay_tree_t *config_tree, const char *fname) {
-	FILE *fp;
+/// Read a host configuration file.
+bool config_read(meshlink_handle_t *mesh, const char *conf_subdir, const char *name, config_t *config, void *key) {
+	assert(conf_subdir);
 
-	fp = fopen(fname, "w+");
+	if(!mesh->confbase) {
+		return false;
+	}
+
+	char path[PATH_MAX];
+	make_host_path(mesh, conf_subdir, name, path, sizeof(path));
 
-	if(!fp) {
-		logger(NULL, MESHLINK_ERROR, "Cannot open config file %s: %s", fname, strerror(errno));
+	FILE *f = fopen(path, "r");
+
+	if(!f) {
+		logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", path, 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(!config_read_file(mesh, f, config, key)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", path, strerror(errno));
+		fclose(f);
+		return false;
+	}
 
-		if(fwrite(" = ", sizeof(char), 3, fp) < 3) {
-			goto error;
-		}
+	fclose(f);
 
-		if(fwrite(cnf->value, sizeof(char), strlen(cnf->value), fp) < strlen(cnf->value)) {
-			goto error;
+	return true;
+}
+
+bool config_scan_all(meshlink_handle_t *mesh, const char *conf_subdir, const char *conf_type, config_scan_action_t action, void *arg) {
+	assert(conf_subdir);
+	assert(conf_type);
+
+	if(!mesh->confbase) {
+		return true;
+	}
+
+	DIR *dir;
+	struct dirent *ent;
+	char dname[PATH_MAX];
+	snprintf(dname, sizeof(dname), "%s" SLASH "%s" SLASH "%s", mesh->confbase, conf_subdir, conf_type);
+
+	dir = opendir(dname);
+
+	if(!dir) {
+		logger(mesh, MESHLINK_ERROR, "Could not open %s: %s", dname, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
+
+	while((ent = readdir(dir))) {
+		if(ent->d_name[0] == '.') {
+			continue;
 		}
 
-		if(fwrite("\n", sizeof(char), 1, fp) < 1) {
-			goto error;
+		if(!action(mesh, ent->d_name, arg)) {
+			closedir(dir);
+			return false;
 		}
 	}
 
-	fclose(fp);
+	closedir(dir);
 	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;
+/// Write a host configuration file.
+bool config_write(meshlink_handle_t *mesh, const char *conf_subdir, const char *name, const config_t *config, void *key) {
+	assert(conf_subdir);
+	assert(name);
+	assert(config);
 
-	snprintf(filename, PATH_MAX, "%s" SLASH "meshlink.conf", mesh->confbase);
-	errno = 0;
-	x = read_config_file(mesh->config, filename);
+	if(!mesh->confbase) {
+		return true;
+	}
+
+	char path[PATH_MAX];
+	char tmp_path[PATH_MAX + 4];
+	make_host_path(mesh, conf_subdir, name, path, sizeof(path));
+	snprintf(tmp_path, sizeof(tmp_path), "%s.tmp", path);
+
+	FILE *f = fopen(tmp_path, "w");
+
+	if(!f) {
+		logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", tmp_path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
+
+	if(!config_write_file(mesh, f, config, key)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to write `%s': %s", tmp_path, strerror(errno));
+		fclose(f);
+		return false;
+	}
 
-	if(!x && errno) {
-		logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", filename, strerror(errno));
+	if(fclose(f)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", tmp_path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
 	}
 
-	return x;
+	if(rename(tmp_path, path)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to rename `%s' to `%s': %s", tmp_path, path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
+
+	return true;
 }
 
-bool read_host_config(meshlink_handle_t *mesh, splay_tree_t *config_tree, const char *name) {
-	char filename[PATH_MAX];
-	bool x;
+/// Delete a host configuration file.
+bool config_delete(meshlink_handle_t *mesh, const char *conf_subdir, const char *name) {
+	assert(conf_subdir);
+	assert(name);
 
-	snprintf(filename, PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
-	x = read_config_file(config_tree, filename);
+	if(!mesh->confbase) {
+		return true;
+	}
+
+	char path[PATH_MAX];
+	make_host_path(mesh, conf_subdir, name, path, sizeof(path));
 
-	return x;
+	if(unlink(path) && errno != ENOENT) {
+		logger(mesh, MESHLINK_ERROR, "Failed to unlink `%s': %s", path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
+
+	return true;
 }
 
-bool write_host_config(struct meshlink_handle *mesh, const struct splay_tree_t *config_tree, const char *name) {
-	char filename[PATH_MAX];
+/// Read the main configuration file.
+bool main_config_read(meshlink_handle_t *mesh, const char *conf_subdir, config_t *config, void *key) {
+	assert(conf_subdir);
+	assert(config);
+
+	if(!mesh->confbase) {
+		return false;
+	}
+
+	char path[PATH_MAX];
+	make_main_path(mesh, conf_subdir, path, sizeof(path));
+
+	FILE *f = fopen(path, "r");
+
+	if(!f) {
+		logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", path, strerror(errno));
+		return false;
+	}
+
+	if(!config_read_file(mesh, f, config, key)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", path, strerror(errno));
+		fclose(f);
+		return false;
+	}
+
+	fclose(f);
 
-	snprintf(filename, PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
-	return write_config_file(config_tree, filename);
+	return true;
 }
 
-bool modify_config_file(struct meshlink_handle *mesh, const char *name, const char *key, const char *value, int trim) {
-	assert(mesh && name && key);
+/// Write the main configuration file.
+bool main_config_write(meshlink_handle_t *mesh, const char *conf_subdir, const config_t *config, void *key) {
+	assert(conf_subdir);
+	assert(config);
 
-	char filename[PATH_MAX];
-	char tmpname[PATH_MAX];
-	bool error = false;
+	if(!mesh->confbase) {
+		return true;
+	}
 
-	snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
-	snprintf(tmpname, sizeof(tmpname), "%s.tmp", filename);
+	char path[PATH_MAX];
+	char tmp_path[PATH_MAX + 4];
+	make_main_path(mesh, conf_subdir, path, sizeof(path));
+	snprintf(tmp_path, sizeof(tmp_path), "%s.tmp", path);
 
-	FILE *fr = fopen(filename, "r");
+	FILE *f = fopen(tmp_path, "w");
+
+	if(!f) {
+		logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", tmp_path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
 
-	if(!fr) {
-		logger(mesh, MESHLINK_ERROR, "Cannot open config file %s: %s", filename, strerror(errno));
+	if(!config_write_file(mesh, f, config, key)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to write `%s': %s", tmp_path, strerror(errno));
+		fclose(f);
 		return false;
 	}
 
-	FILE *fw = fopen(tmpname, "w");
+	if(rename(tmp_path, path)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to rename `%s' to `%s': %s", tmp_path, path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		fclose(f);
+		return false;
+	}
 
-	if(!fw) {
-		logger(mesh, MESHLINK_ERROR, "Cannot open temporary file %s: %s", tmpname, strerror(errno));
-		fclose(fr);
+	if(fclose(f)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", tmp_path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
 		return false;
 	}
 
-	char buf[4096];
-	char *sep;
-	int found = 0;
+	return true;
+}
+
+/// Read an invitation file from the confbase sub-directory, and immediately delete it.
+bool invitation_read(meshlink_handle_t *mesh, const char *conf_subdir, const char *name, config_t *config, void *key) {
+	assert(conf_subdir);
+	assert(name);
+	assert(config);
 
-	if(value) {
-		fprintf(fw, "%s = %s\n", key, value);
-		found++;
+	if(!mesh->confbase) {
+		return false;
 	}
 
-	while(readline(fr, buf, sizeof(buf))) {
-		if(!*buf || *buf == '#') {
-			goto copy;
+	char path[PATH_MAX];
+	char used_path[PATH_MAX];
+	make_invitation_path(mesh, conf_subdir, name, path, sizeof(path));
+	make_used_invitation_path(mesh, conf_subdir, name, used_path, sizeof(used_path));
+
+	// Atomically rename the invitation file
+	if(rename(path, used_path)) {
+		if(errno == ENOENT) {
+			logger(mesh, MESHLINK_ERROR, "Peer tried to use non-existing invitation %s\n", name);
+		} else {
+			logger(mesh, MESHLINK_ERROR, "Error trying to rename invitation %s\n", name);
 		}
 
-		sep = strchr(buf, ' ');
+		return false;
+	}
 
-		if(!sep) {
-			goto copy;
-		}
+	FILE *f = fopen(used_path, "r");
 
-		*sep = 0;
+	if(!f) {
+		logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", path, strerror(errno));
+		return false;
+	}
 
-		if(strcmp(buf, key)) {
-			*sep = ' ';
-			goto copy;
-		}
+	// Check the timestamp
+	struct stat st;
 
-		// 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;
-		}
+	if(fstat(fileno(f), &st)) {
+		logger(mesh, MESHLINK_ERROR, "Could not stat invitation file %s\n", name);
+		fclose(f);
+		unlink(used_path);
+		return false;
+	}
 
-		// We found the key but with a different value, delete it if wanted.
-		found++;
+	if(time(NULL) >= st.st_mtime + mesh->invitation_timeout) {
+		logger(mesh, MESHLINK_ERROR, "Peer tried to use an outdated invitation file %s\n", name);
+		fclose(f);
+		unlink(used_path);
+		return false;
+	}
 
-		if((!value || trim) && found > trim) {
-			continue;
-		}
+	if(!config_read_file(mesh, f, config, key)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", path, strerror(errno));
+		fclose(f);
+		unlink(used_path);
+		return false;
+	}
 
-		*sep = ' ';
+	fclose(f);
 
-copy:
-		fprintf(fw, "%s\n", buf);
+	if(unlink(used_path)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to unlink `%s': %s", path, strerror(errno));
+		return false;
 	}
 
-	if(ferror(fr)) {
-		error = true;
+	snprintf(path, sizeof(path), "%s" SLASH "%s" SLASH "invitations", mesh->confbase, conf_subdir);
+
+	if(!sync_path(path)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
 	}
 
-	fclose(fr);
+	return true;
+}
+
+/// Write an invitation file.
+bool invitation_write(meshlink_handle_t *mesh, const char *conf_subdir, const char *name, const config_t *config, void *key) {
+	assert(conf_subdir);
+	assert(name);
+	assert(config);
 
-	if(ferror(fw)) {
-		error = true;
+	if(!mesh->confbase) {
+		return false;
 	}
 
-	if(fclose(fw)) {
-		error = true;
+	char path[PATH_MAX];
+	make_invitation_path(mesh, conf_subdir, name, path, sizeof(path));
+
+	FILE *f = fopen(path, "w");
+
+	if(!f) {
+		logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
 	}
 
-	// If any error occured during reading or writing, exit.
-	if(error) {
-		unlink(tmpname);
+	if(!config_write_file(mesh, f, config, key)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to write `%s': %s", path, strerror(errno));
+		fclose(f);
 		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(fclose(f)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
 
-	if(rename(filename, bakname) || rename(tmpname, filename)) {
-		rename(bakname, filename);
-#else
+	snprintf(path, sizeof(path), "%s" SLASH "%s" SLASH "invitations", mesh->confbase, conf_subdir);
 
-	if(rename(tmpname, filename)) {
-#endif
+	if(!sync_path(path)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
 		return false;
-	} else {
-#ifdef HAVE_MINGW
-		unlink(bakname);
-#endif
-		return true;
 	}
+
+	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);
+/// Purge old invitation files
+size_t invitation_purge_old(meshlink_handle_t *mesh, time_t deadline) {
+	if(!mesh->confbase) {
+		return true;
+	}
+
+	char path[PATH_MAX];
+	make_invitation_path(mesh, "current", "", path, sizeof(path));
+
+	DIR *dir = opendir(path);
+
+	if(!dir) {
+		logger(mesh, MESHLINK_DEBUG, "Could not read directory %s: %s\n", path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return 0;
+	}
+
+	errno = 0;
+	size_t count = 0;
+	struct dirent *ent;
+
+	while((ent = readdir(dir))) {
+		if(strlen(ent->d_name) != 24) {
+			continue;
+		}
+
+		char invname[PATH_MAX];
+		struct stat st;
+
+		if(snprintf(invname, sizeof(invname), "%s" SLASH "%s", path, ent->d_name) >= PATH_MAX) {
+			logger(mesh, MESHLINK_DEBUG, "Filename too long: %s" SLASH "%s", path, ent->d_name);
+			continue;
+		}
+
+		if(!stat(invname, &st)) {
+			if(mesh->invitation_key && deadline < st.st_mtime) {
+				count++;
+			} else {
+				unlink(invname);
+			}
+		} else {
+			logger(mesh, MESHLINK_DEBUG, "Could not stat %s: %s\n", invname, strerror(errno));
+			errno = 0;
+		}
+	}
+
+	if(errno) {
+		logger(mesh, MESHLINK_DEBUG, "Error while reading directory %s: %s\n", path, strerror(errno));
+		closedir(dir);
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return 0;
+	}
+
+	closedir(dir);
+
+	return count;
 }