X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fconf.c;h=9527c1edf5c13cda07db36b6255ec4ee777b078e;hp=bf8183f7d9b8e1fe4eb10f8f4d870f0e2bb4b735;hb=be83b0af60449c7b35d17d97f2e6dc12f611e831;hpb=ce8775000ab38229a78ecf3dc26bab008ca0f332

diff --git a/src/conf.c b/src/conf.c
index bf8183f7..9527c1ed 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,10 +1,6 @@
 /*
-    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
+    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
@@ -22,419 +18,1021 @@
 */
 
 #include "system.h"
+#include <assert.h>
+#include <sys/types.h>
+#include <utime.h>
 
-#include "splay_tree.h"
-#include "connection.h"
 #include "conf.h"
+#include "crypto.h"
 #include "logger.h"
-#include "netutl.h"				/* for str2address */
-#include "protocol.h"
-#include "utils.h"				/* for cp */
+#include "meshlink_internal.h"
 #include "xalloc.h"
+#include "packmsg.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 */
+/// 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);
 
+	snprintf(path, len, "%s" SLASH "%s" SLASH "meshlink.conf", mesh->confbase, conf_subdir);
+}
 
-static int config_compare(const config_t *a, const config_t *b) {
-	int 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 = strcasecmp(a->variable, b->variable);
+	snprintf(path, len, "%s" SLASH "%s" SLASH "hosts" SLASH "%s", mesh->confbase, conf_subdir, name);
+}
 
-	if(result)
-		return result;
+/// 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);
 
-	/* give priority to command line options */
-	result = !b->file - !a->file;
-	if (result)
-		return result;
+	snprintf(path, len, "%s" SLASH "%s" SLASH "invitations" SLASH "%s", mesh->confbase, conf_subdir, name);
+}
 
-	result = a->line - b->line;
+/// 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);
 
-	if(result)
-		return result;
-	else
-		return a->file ? strcmp(a->file, b->file) : 0;
+	snprintf(path, len, "%s" SLASH "%s" SLASH "invitations" SLASH "%s.used", 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);
-}
+/// 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);
 
-void exit_configuration(splay_tree_t ** config_tree) {
-	splay_delete_tree(*config_tree);
-	*config_tree = NULL;
+			if(unlink(filename)) {
+				if(!deltree(filename)) {
+					return false;
+				}
+			}
+		}
+
+		closedir(d);
+	} else {
+		return errno == ENOENT;
+	}
+
+	return rmdir(dirname) == 0;
 }
 
-config_t *new_config(void) {
-	return xmalloc_and_zero(sizeof(config_t));
+bool sync_path(const char *pathname) {
+	assert(pathname);
+
+	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(fsync(fd)) {
+		logger(NULL, MESHLINK_ERROR, "Failed to sync %s: %s\n", pathname, strerror(errno));
+		close(fd);
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
+
+	if(close(fd)) {
+		logger(NULL, MESHLINK_ERROR, "Failed to close %s: %s\n", pathname, strerror(errno));
+		close(fd);
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
+
+	return true;
 }
 
-void free_config(config_t *cfg) {
-	if(cfg->variable)
-		free(cfg->variable);
+/// 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;
+	}
 
-	if(cfg->value)
-		free(cfg->value);
+	packmsg_input_t in = {config.buf, config.len};
 
-	if(cfg->file)
-		free(cfg->file);
+	uint32_t version = packmsg_get_uint32(&in);
+	config_free(&config);
 
-	free(cfg);
+	return version == MESHLINK_CONFIG_VERSION;
 }
 
-void config_add(splay_tree_t *config_tree, config_t *cfg) {
-	splay_insert(config_tree, cfg);
+/// Create a fresh configuration directory
+bool config_init(meshlink_handle_t *mesh, const char *conf_subdir) {
+	assert(conf_subdir);
+
+	if(!mesh->confbase) {
+		return true;
+	}
+
+	char path[PATH_MAX];
+
+	// 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(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 true;
 }
 
-config_t *lookup_config(splay_tree_t *config_tree, char *variable) {
-	config_t cfg, *found;
+/// Wipe an existing configuration directory
+bool config_destroy(const char *confbase, const char *conf_subdir) {
+	assert(conf_subdir);
 
-	cfg.variable = variable;
-	cfg.file = NULL;
-	cfg.line = 0;
+	if(!confbase) {
+		return true;
+	}
 
-	found = splay_search_closest_greater(config_tree, &cfg);
+	struct stat st;
 
-	if(!found)
-		return NULL;
+	char path[PATH_MAX];
 
-	if(strcasecmp(found->variable, variable))
-		return NULL;
+	// 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;
+		}
+	}
+
+	// Remove meshlink.conf
+	snprintf(path, sizeof(path), "%s" SLASH "%s" SLASH "meshlink.conf", confbase, conf_subdir);
 
-	return found;
+	if(unlink(path)) {
+		if(errno != ENOENT) {
+			logger(NULL, MESHLINK_ERROR, "Cannot delete %s: %s\n", path, strerror(errno));
+			meshlink_errno = MESHLINK_ESTORAGE;
+			return false;
+		}
+	}
+
+	snprintf(path, sizeof(path), "%s" SLASH "%s", confbase, conf_subdir);
+
+	if(!deltree(path)) {
+		logger(NULL, MESHLINK_ERROR, "Cannot delete %s: %s\n", path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
+
+	return sync_path(confbase);
 }
 
-config_t *lookup_config_next(splay_tree_t *config_tree, const config_t *cfg) {
-	splay_node_t *node;
-	config_t *found;
+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;
 
-	node = splay_search_node(config_tree, cfg);
+	DIR *src_dir = opendir(src_dir_name);
 
-	if(node) {
-		if(node->next) {
-			found = node->next->data;
+	if(!src_dir) {
+		logger(NULL, MESHLINK_ERROR, "Could not open directory file %s\n", src_dir_name);
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
+
+	// 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;
+	}
+
+	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;
+		}
 
-			if(!strcasecmp(found->variable, cfg->variable))
-				return found;
+		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;
+			}
+
+			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;
+			}
 		}
 	}
 
-	return NULL;
+	closedir(src_dir);
+	return true;
+}
+
+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);
 }
 
-bool get_config_bool(const config_t *cfg, bool *result) {
-	if(!cfg)
+/// 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;
+	}
 
-	if(!strcasecmp(cfg->value, "yes")) {
-		*result = true;
-		return true;
-	} else if(!strcasecmp(cfg->value, "no")) {
-		*result = false;
+	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(!mesh->confbase) {
+		return false;
+	}
+
+	char old_path[PATH_MAX];
+	char new_path[PATH_MAX];
+
+	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 config_sync(meshlink_handle_t *mesh, const char *conf_subdir) {
+	assert(conf_subdir);
+
+	if(!mesh->confbase) {
 		return true;
 	}
 
-	logger(LOG_ERR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d",
-		   cfg->variable, cfg->file, cfg->line);
+	char path[PATH_MAX];
+	snprintf(path, sizeof(path), "%s" SLASH "%s" SLASH "hosts", mesh->confbase, conf_subdir);
 
-	return false;
+	if(!sync_path(path)) {
+		return false;
+	}
+
+	snprintf(path, sizeof(path), "%s" SLASH "%s", mesh->confbase, conf_subdir);
+
+	if(!sync_path(path)) {
+		return false;
+	}
+
+	return true;
 }
 
-bool get_config_int(const config_t *cfg, int *result) {
-	if(!cfg)
+bool meshlink_confbase_exists(meshlink_handle_t *mesh) {
+	if(!mesh->confbase) {
 		return false;
+	}
+
+	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;
+		}
+	}
+
+	if(mesh->config_key && !confbase_decryptable && main_config_exists(mesh, "new")) {
+		confbase_exists = true;
+
+		if(main_config_decrypt(mesh, "new")) {
+			if(!config_destroy(mesh->confbase, "current")) {
+				return false;
+			}
+
+			if(!config_rename(mesh, "new", "current")) {
+				return false;
+			}
+
+			confbase_decryptable = true;
+		}
+	}
+
+	if(mesh->config_key && !confbase_decryptable && main_config_exists(mesh, "old")) {
+		confbase_exists = 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;
+		}
+	}
+
+	// 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;
+		}
+	}
 
-	if(sscanf(cfg->value, "%d", result) == 1)
+	return confbase_exists;
+}
+
+/// Lock the main configuration file. Creates confbase if necessary.
+bool main_config_lock(meshlink_handle_t *mesh) {
+	if(!mesh->confbase) {
 		return true;
+	}
+
+	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;
+	}
+
+	char path[PATH_MAX];
+	snprintf(path, sizeof(path), "%s" SLASH "meshlink.lock", mesh->confbase);
+
+	mesh->lockfile = fopen(path, "w+");
 
-	logger(LOG_ERR, "Integer expected for configuration variable %s in %s line %d",
-		   cfg->variable, cfg->file, cfg->line);
+	if(!mesh->lockfile) {
+		logger(NULL, MESHLINK_ERROR, "Cannot not open %s: %s\n", path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
 
-	return false;
+#ifdef FD_CLOEXEC
+	fcntl(fileno(mesh->lockfile), F_SETFD, FD_CLOEXEC);
+#endif
+
+#ifdef HAVE_MINGW
+	// TODO: use _locking()?
+#else
+
+	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;
+	}
+
+#endif
+
+	return true;
+}
+
+/// Unlock the main configuration file.
+void main_config_unlock(meshlink_handle_t *mesh) {
+	if(mesh->lockfile) {
+		fclose(mesh->lockfile);
+		mesh->lockfile = NULL;
+	}
 }
 
-bool get_config_string(const config_t *cfg, char **result) {
-	if(!cfg)
+/// 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);
+
+	long len;
+
+	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;
+	}
 
-	*result = xstrdup(cfg->value);
+	uint8_t *buf = xmalloc(len);
+
+	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;
+	}
+
+	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;
+		}
+	}
+
+	config->buf = buf;
+	config->len = len;
 
 	return true;
 }
 
-bool get_config_address(const config_t *cfg, struct addrinfo **result) {
-	struct addrinfo *ai;
+/// 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(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;
+
+		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(!success) {
+				logger(mesh, MESHLINK_ERROR, "Cannot write config file: %s", strerror(errno));
+			}
+
+			meshlink_errno = MESHLINK_ESTORAGE;
+		} else {
+			logger(mesh, MESHLINK_ERROR, "Cannot encrypt config file\n");
+			meshlink_errno = MESHLINK_ESTORAGE;
+		}
+
+		chacha_poly1305_exit(ctx);
+		return success;
+	}
 
-	if(!cfg)
+	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;
+	}
 
-	ai = str2addrinfo(cfg->value, NULL, 0);
+	if(fflush(f)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to flush file: %s", strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
 
-	if(ai) {
-		*result = ai;
-		return true;
+	if(fsync(fileno(f))) {
+		logger(mesh, MESHLINK_ERROR, "Failed to sync file: %s\n", strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
 	}
 
-	logger(LOG_ERR, "Hostname or IP address expected for configuration variable %s in %s line %d",
-		   cfg->variable, cfg->file, cfg->line);
+	return true;
+}
+
+/// Free resources of a loaded configuration file.
+void config_free(config_t *config) {
+	assert(!config->len || config->buf);
 
-	return false;
+	free((uint8_t *)config->buf);
+	config->buf = NULL;
+	config->len = 0;
 }
 
-bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
-	subnet_t subnet = {0};
+/// 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(!cfg)
+	if(!mesh->confbase) {
 		return false;
+	}
+
+	char path[PATH_MAX];
+	make_host_path(mesh, conf_subdir, name, path, sizeof(path));
 
-	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 access(path, F_OK) == 0;
+}
+
+/// 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);
+
+	if(!mesh->confbase) {
 		return false;
 	}
 
-	/* Teach newbies what subnets are... */
+	char path[PATH_MAX];
+	make_host_path(mesh, conf_subdir, name, 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(((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);
+	if(!config_read_file(mesh, f, config, key)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", path, strerror(errno));
+		fclose(f);
 		return false;
 	}
 
-	*(*result = new_subnet()) = subnet;
+	fclose(f);
 
 	return true;
 }
 
-/*
-  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;
+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(feof(fp))
-		return NULL;
+	if(!mesh->confbase) {
+		return true;
+	}
 
-	p = fgets(buf, buflen, fp);
+	DIR *dir;
+	struct dirent *ent;
+	char dname[PATH_MAX];
+	snprintf(dname, sizeof(dname), "%s" SLASH "%s" SLASH "%s", mesh->confbase, conf_subdir, conf_type);
 
-	if(!p)
-		return NULL;
+	dir = opendir(dname);
 
-	newline = strchr(p, '\n');
+	if(!dir) {
+		logger(mesh, MESHLINK_ERROR, "Could not open %s: %s", dname, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
 
-	if(!newline)
-		return buf;
+	while((ent = readdir(dir))) {
+		if(ent->d_name[0] == '.') {
+			continue;
+		}
 
-	*newline = '\0';	/* kill newline */
-	if(newline > p && newline[-1] == '\r')	/* and carriage return if necessary */
-		newline[-1] = '\0';
+		if(!action(mesh, ent->d_name, arg)) {
+			closedir(dir);
+			return false;
+		}
+	}
 
-	return buf;
+	closedir(dir);
+	return true;
 }
 
-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(!*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);
-		return NULL;
+/// 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);
+
+	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(fclose(f)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", tmp_path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
 	}
 
-	cfg = new_config();
-	cfg->variable = xstrdup(variable);
-	cfg->value = xstrdup(value);
-	cfg->file = fname ? xstrdup(fname) : NULL;
-	cfg->line = lineno;
+	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 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;
+/// Delete a host configuration file.
+bool config_delete(meshlink_handle_t *mesh, const char *conf_subdir, const char *name) {
+	assert(conf_subdir);
+	assert(name);
 
-	fp = fopen(fname, "r");
+	if(!mesh->confbase) {
+		return true;
+	}
+
+	char path[PATH_MAX];
+	make_host_path(mesh, conf_subdir, name, path, sizeof(path));
 
-	if(!fp) {
-		logger(LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno));
+	if(unlink(path) && errno != ENOENT) {
+		logger(mesh, MESHLINK_ERROR, "Failed to unlink `%s': %s", path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
 		return false;
 	}
 
-	for(;;) {
-		line = readline(fp, buffer, sizeof buffer);
+	return true;
+}
 
-		if(!line) {
-			if(feof(fp))
-				result = true;
-			break;
-		}
+/// 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);
 
-		lineno++;
+	if(!mesh->confbase) {
+		return false;
+	}
 
-		if(!*line || *line == '#')
-			continue;
+	char path[PATH_MAX];
+	make_main_path(mesh, conf_subdir, path, sizeof(path));
 
-		if(ignore) {
-			if(!strncmp(line, "-----END", 8))
-				ignore = false;
-			continue;
-		}
-		
-		if(!strncmp(line, "-----BEGIN", 10)) {
-			ignore = true;
-			continue;
-		}
+	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;
+	}
 
-		cfg = parse_config_line(line, fname, lineno);
-		if (!cfg)
-			break;
-		config_add(config_tree, cfg);
+	fclose(f);
+
+	return true;
+}
+
+/// 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);
+
+	if(!mesh->confbase) {
+		return true;
+	}
+
+	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 *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(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;
 	}
 
-	fclose(fp);
+	if(fclose(f)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", tmp_path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
 
-	return result;
+	return true;
 }
 
-void read_config_options(splay_tree_t *config_tree, const char *prefix) {
-	list_node_t *node, *next;
-	size_t prefix_len = prefix ? strlen(prefix) : 0;
+/// 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);
 
-	for(node = cmdline_conf->tail; node; node = next) {
-		config_t *orig_cfg, *cfg = (config_t *)node->data;
-		next = node->prev;
+	if(!mesh->confbase) {
+		return false;
+	}
 
-		if(!prefix) {
-			if(strchr(cfg->variable, '.'))
-				continue;
-			node->data = NULL;
-			list_unlink_node(cmdline_conf, node);
+	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 {
-			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;
+			logger(mesh, MESHLINK_ERROR, "Error trying to rename invitation %s\n", name);
 		}
-		config_add(config_tree, cfg);
+
+		return false;
 	}
-}
 
-bool read_server_config() {
-	char *fname;
-	bool x;
+	FILE *f = fopen(used_path, "r");
 
-	read_config_options(config_tree, NULL);
+	if(!f) {
+		logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", path, strerror(errno));
+		return false;
+	}
 
-	xasprintf(&fname, "%s/tinc.conf", confbase);
-	x = read_config_file(config_tree, fname);
+	// Check the timestamp
+	struct stat st;
 
-	if(!x) {				/* System error: complain */
-		logger(LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
+	if(fstat(fileno(f), &st)) {
+		logger(mesh, MESHLINK_ERROR, "Could not stat invitation file %s\n", name);
+		fclose(f);
+		unlink(used_path);
+		return false;
 	}
 
-	free(fname);
+	if(mesh->loop.now.tv_sec >= 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;
+	}
 
-	return x;
-}
+	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;
+	}
+
+	fclose(f);
 
-bool read_connection_config(connection_t *c) {
-	char *fname;
-	bool x;
+	if(unlink(used_path)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to unlink `%s': %s", path, strerror(errno));
+		return false;
+	}
 
-	read_config_options(c->config_tree, c->name);
+	snprintf(path, sizeof(path), "%s" SLASH "%s" SLASH "invitations", mesh->confbase, conf_subdir);
 
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	x = read_config_file(c->config_tree, fname);
-	free(fname);
+	if(!sync_path(path)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
 
-	return x;
+	return true;
 }
 
-bool disable_old_keys(FILE *f) {
-	char buf[100];
-	long pos;
-	bool disabled = false;
+/// 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(!mesh->confbase) {
+		return false;
+	}
+
+	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(!config_write_file(mesh, f, config, key)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to write `%s': %s", path, strerror(errno));
+		fclose(f);
+		return false;
+	}
+
+	if(fclose(f)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
 
-	rewind(f);
-	pos = ftell(f);
+	snprintf(path, sizeof(path), "%s" SLASH "%s" SLASH "invitations", mesh->confbase, conf_subdir);
 
-	if(pos < 0)
+	if(!sync_path(path)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", path, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
 		return false;
+	}
 
-	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;
+	return true;
+}
+
+/// 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;
 		}
-		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;
+
+		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;
 		}
-		pos = ftell(f);
-		if(pos < 0)
-			break;
+
+		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;
 	}
 
-	return disabled;
+	closedir(dir);
+
+	return count;
 }