X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincctl.c;h=c6d75824498827229866a2fa10e9daa930acd080;hp=0d773e423916c16b870923d6b9300a062aa44c72;hb=38adc8bf548c2c465d5f4147866c3d3f9112d3a8;hpb=e971130b601064090815c31c90b876e3d0d1d5b1

diff --git a/src/tincctl.c b/src/tincctl.c
index 0d773e42..c6d75824 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1,6 +1,6 @@
 /*
     tincctl.c -- Controlling a running tincd
-    Copyright (C) 2007-2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2013 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -29,21 +29,16 @@
 #include "xalloc.h"
 #include "protocol.h"
 #include "control_common.h"
+#include "crypto.h"
 #include "ecdsagen.h"
 #include "info.h"
+#include "invitation.h"
+#include "names.h"
 #include "rsagen.h"
 #include "utils.h"
 #include "tincctl.h"
 #include "top.h"
 
-#ifdef HAVE_MINGW
-#define mkdir(a, b) mkdir(a)
-#endif
-
-
-/* The name this program was run with. */
-static char *program_name = NULL;
-
 static char **orig_argv;
 static int orig_argc;
 
@@ -54,44 +49,32 @@ static bool show_help = false;
 static bool show_version = false;
 
 static char *name = NULL;
-static char *identname = NULL;				/* program name for syslog */
-static char *pidfilename = NULL;			/* pid file location */
-static char *confdir = NULL;
-static char controlcookie[1024];
-char *netname = NULL;
-char *confbase = NULL;
-static char *tinc_conf = NULL;
-static char *hosts_dir = NULL;
+static char controlcookie[1025];
+char *tinc_conf = NULL;
+char *hosts_dir = NULL;
+struct timeval now;
 
 // Horrible global variables...
 static int pid = 0;
-static int fd = -1;
-static char line[4096];
+int fd = -1;
+char line[4096];
 static int code;
 static int req;
 static int result;
 static bool force = false;
-static bool tty = true;
-
-#ifdef HAVE_MINGW
-static struct WSAData wsa_state;
-#endif
+bool tty = true;
+bool confbasegiven = false;
+bool netnamegiven = false;
+char *scriptinterpreter = NULL;
+char *scriptextension = "";
 
 static struct option const long_options[] = {
 	{"config", required_argument, NULL, 'c'},
-	{"debug", optional_argument, NULL, 0},
-	{"no-detach", no_argument, NULL, 0},
-	{"mlock", no_argument, NULL, 0},
 	{"net", required_argument, NULL, 'n'},
 	{"help", no_argument, NULL, 1},
 	{"version", no_argument, NULL, 2},
-	{"pidfile", required_argument, NULL, 5},
-	{"logfile", required_argument, NULL, 0},
-	{"bypass-security", no_argument, NULL, 0},
-	{"chroot", no_argument, NULL, 0},
-	{"user", required_argument, NULL, 0},
-	{"option", required_argument, NULL, 0},
-	{"force", no_argument, NULL, 6},
+	{"pidfile", required_argument, NULL, 3},
+	{"force", no_argument, NULL, 4},
 	{NULL, 0, NULL, 0}
 };
 
@@ -106,10 +89,9 @@ static void version(void) {
 }
 
 static void usage(bool status) {
-	if(status)
-		fprintf(stderr, "Try `%s --help\' for more information.\n",
-				program_name);
-	else {
+	if(status) {
+		fprintf(stderr, "Try `%s --help\' for more information.\n", program_name);
+	} else {
 		printf("Usage: %s [options] command\n\n", program_name);
 		printf("Valid options are:\n"
 				"  -c, --config=DIR        Read configuration options from DIR.\n"
@@ -120,21 +102,20 @@ static void usage(bool status) {
 				"\n"
 				"Valid commands are:\n"
 				"  init [name]                Create initial configuration files.\n"
-				"  config                     Change configuration:\n"
-				"    [get] VARIABLE           - print current value of VARIABLE\n"
-				"    [set] VARIABLE VALUE     - set VARIABLE to VALUE\n"
-				"    add VARIABLE VALUE       - add VARIABLE with the given VALUE\n"
-				"    del VARIABLE [VALUE]     - remove VARIABLE [only ones with watching VALUE]\n"
+				"  get VARIABLE               Print current value of VARIABLE\n"
+				"  set VARIABLE VALUE         Set VARIABLE to VALUE\n"
+				"  add VARIABLE VALUE         Add VARIABLE with the given VALUE\n"
+				"  del VARIABLE [VALUE]       Remove VARIABLE [only ones with watching VALUE]\n"
 				"  start [tincd options]      Start tincd.\n"
 				"  stop                       Stop tincd.\n"
-				"  restart                    Restart tincd.\n"
+				"  restart [tincd options]    Restart tincd.\n"
 				"  reload                     Partially reload configuration of running tincd.\n"
 				"  pid                        Show PID of currently running tincd.\n"
 				"  generate-keys [bits]       Generate new RSA and ECDSA public/private keypairs.\n"
 				"  generate-rsa-keys [bits]   Generate a new RSA public/private keypair.\n"
 				"  generate-ecdsa-keys        Generate a new ECDSA public/private keypair.\n"
 				"  dump                       Dump a list of one of the following things:\n"
-				"    nodes                    - all known nodes in the VPN\n"
+				"    [reachable] nodes        - all known nodes in the VPN\n"
 				"    edges                    - all known connections in the VPN\n"
 				"    subnets                  - all known subnets in the VPN\n"
 				"    connections              - all meta connections with ourself\n"
@@ -152,6 +133,10 @@ static void usage(bool status) {
 				"  export                     Export host configuration of local node to standard output\n"
 				"  export-all                 Export all host configuration files to standard output\n"
 				"  import [--force]           Import host configuration file(s) from standard input\n"
+				"  exchange [--force]         Same as export followed by import\n"
+				"  exchange-all [--force]     Same as export-all followed by import\n"
+				"  invite NODE [...]          Generate an invitation for NODE\n"
+				"  join INVITATION            Join a VPN using an INVITIATION\n"
 				"\n");
 		printf("Report bugs to tinc@tinc-vpn.org.\n");
 	}
@@ -161,36 +146,37 @@ static bool parse_options(int argc, char **argv) {
 	int r;
 	int option_index = 0;
 
-	while((r = getopt_long(argc, argv, "c:n:Dd::Lo:RU:", long_options, &option_index)) != EOF) {
+	while((r = getopt_long(argc, argv, "+c:n:", long_options, &option_index)) != EOF) {
 		switch (r) {
-			case 0:				/* long option */
+			case 0:   /* long option */
 				break;
 
-			case 'c':				/* config file */
+			case 'c': /* config file */
 				confbase = xstrdup(optarg);
+				confbasegiven = true;
 				break;
 
-			case 'n':				/* net name given */
+			case 'n': /* net name given */
 				netname = xstrdup(optarg);
 				break;
 
-			case 1:					/* show help */
+			case 1:   /* show help */
 				show_help = true;
 				break;
 
-			case 2:					/* show version */
+			case 2:   /* show version */
 				show_version = true;
 				break;
 
-			case 5:					/* open control socket here */
+			case 3:   /* open control socket here */
 				pidfilename = xstrdup(optarg);
 				break;
 
-			case 6:
+			case 4:   /* force */
 				force = true;
 				break;
 
-			case '?':
+			case '?': /* wrong options */
 				usage(true);
 				return false;
 
@@ -199,15 +185,15 @@ static bool parse_options(int argc, char **argv) {
 		}
 	}
 
-        if(!netname && (netname = getenv("NETNAME")))
-                netname = xstrdup(netname);
+	if(!netname && (netname = getenv("NETNAME")))
+		netname = xstrdup(netname);
 
-        /* netname "." is special: a "top-level name" */
+	/* netname "." is special: a "top-level name" */
 
-        if(netname && (!*netname || !strcmp(netname, "."))) {
-                free(netname);
-                netname = NULL;
-        }
+	if(netname && (!*netname || !strcmp(netname, "."))) {
+		free(netname);
+		netname = NULL;
+	}
 
 	if(netname && (strpbrk(netname, "\\/") || *netname == '.')) {
 		fprintf(stderr, "Invalid character in netname!\n");
@@ -217,6 +203,23 @@ static bool parse_options(int argc, char **argv) {
 	return true;
 }
 
+/* Open a file with the desired permissions, minus the umask.
+   Also, if we want to create an executable file, we call fchmod()
+   to set the executable bits. */
+
+FILE *fopenmask(const char *filename, const char *mode, mode_t perms) {
+	mode_t mask = umask(0);
+	perms &= ~mask;
+	umask(~perms);
+	FILE *f = fopen(filename, mode);
+#ifdef HAVE_FCHMOD
+	if((perms & 0444) && f)
+		fchmod(fileno(f), perms);
+#endif
+	umask(mask);
+	return f;
+}
+
 static void disable_old_keys(const char *filename, const char *what) {
 	char tmpfile[PATH_MAX] = "";
 	char buf[1024];
@@ -231,7 +234,9 @@ static void disable_old_keys(const char *filename, const char *what) {
 
 	snprintf(tmpfile, sizeof tmpfile, "%s.tmp", filename);
 
-	w = fopen(tmpfile, "w");
+	struct stat st = {.st_mode = 0600};
+	fstat(fileno(r), &st);
+	w = fopenmask(tmpfile, "w", st.st_mode);
 
 	while(fgets(buf, sizeof buf, r)) {
 		if(!block && !strncmp(buf, "-----BEGIN ", 11)) {
@@ -294,7 +299,7 @@ static void disable_old_keys(const char *filename, const char *what) {
 	unlink(tmpfile);
 }
 
-static FILE *ask_and_open(const char *filename, const char *what, const char *mode, bool ask) {
+static FILE *ask_and_open(const char *filename, const char *what, const char *mode, bool ask, mode_t perms) {
 	FILE *r;
 	char *directory;
 	char buf[PATH_MAX];
@@ -303,13 +308,11 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
 	/* Check stdin and stdout */
 	if(ask && tty) {
 		/* Ask for a file and/or directory name. */
-		fprintf(stdout, "Please enter a file to save %s to [%s]: ",
-				what, filename);
+		fprintf(stdout, "Please enter a file to save %s to [%s]: ", what, filename);
 		fflush(stdout);
 
 		if(fgets(buf, sizeof buf, stdin) == NULL) {
-			fprintf(stderr, "Error while reading stdin: %s\n",
-					strerror(errno));
+			fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
 			return NULL;
 		}
 
@@ -332,13 +335,11 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
 		filename = buf2;
 	}
 
-	umask(0077);				/* Disallow everything for group and other */
-
 	disable_old_keys(filename, what);
 
 	/* Open it first to keep the inode busy */
 
-	r = fopen(filename, mode);
+	r = fopenmask(filename, mode, perms);
 
 	if(!r) {
 		fprintf(stderr, "Error opening file `%s': %s\n", filename, strerror(errno));
@@ -353,50 +354,51 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
   them in.
 */
 static bool ecdsa_keygen(bool ask) {
-	ecdsa_t key;
+	ecdsa_t *key;
 	FILE *f;
-	char *filename;
+	char *pubname, *privname;
 
 	fprintf(stderr, "Generating ECDSA keypair:\n");
 
-	if(!ecdsa_generate(&key)) {
+	if(!(key = ecdsa_generate())) {
 		fprintf(stderr, "Error during key generation!\n");
 		return false;
 	} else
 		fprintf(stderr, "Done.\n");
 
-	xasprintf(&filename, "%s" SLASH "ecdsa_key.priv", confbase);
-	f = ask_and_open(filename, "private ECDSA key", "a", ask);
+	xasprintf(&privname, "%s" SLASH "ecdsa_key.priv", confbase);
+	f = ask_and_open(privname, "private ECDSA key", "a", ask, 0600);
+	free(privname);
 
 	if(!f)
 		return false;
-  
-#ifdef HAVE_FCHMOD
-	/* Make it unreadable for others. */
-	fchmod(fileno(f), 0600);
-#endif
-		
-	ecdsa_write_pem_private_key(&key, f);
+
+	if(!ecdsa_write_pem_private_key(key, f)) {
+		fprintf(stderr, "Error writing private key!\n");
+		ecdsa_free(key);
+		fclose(f);
+		return false;
+	}
 
 	fclose(f);
-	free(filename);
 
 	if(name)
-		xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+		xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 	else
-		xasprintf(&filename, "%s" SLASH "ecdsa_key.pub", confbase);
+		xasprintf(&pubname, "%s" SLASH "ecdsa_key.pub", confbase);
 
-	f = ask_and_open(filename, "public ECDSA key", "a", ask);
+	f = ask_and_open(pubname, "public ECDSA key", "a", ask, 0666);
+	free(pubname);
 
 	if(!f)
 		return false;
 
-	char *pubkey = ecdsa_get_base64_public_key(&key);
+	char *pubkey = ecdsa_get_base64_public_key(key);
 	fprintf(f, "ECDSAPublicKey = %s\n", pubkey);
 	free(pubkey);
 
 	fclose(f);
-	free(filename);
+	ecdsa_free(key);
 
 	return true;
 }
@@ -406,114 +408,67 @@ static bool ecdsa_keygen(bool ask) {
   them in.
 */
 static bool rsa_keygen(int bits, bool ask) {
-	rsa_t key;
+	rsa_t *key;
 	FILE *f;
-	char *filename;
+	char *pubname, *privname;
 
 	fprintf(stderr, "Generating %d bits keys:\n", bits);
 
-	if(!rsa_generate(&key, bits, 0x10001)) {
+	if(!(key = rsa_generate(bits, 0x10001))) {
 		fprintf(stderr, "Error during key generation!\n");
 		return false;
 	} else
 		fprintf(stderr, "Done.\n");
 
-	xasprintf(&filename, "%s" SLASH "rsa_key.priv", confbase);
-	f = ask_and_open(filename, "private RSA key", "a", ask);
+	xasprintf(&privname, "%s" SLASH "rsa_key.priv", confbase);
+	f = ask_and_open(privname, "private RSA key", "a", ask, 0600);
+	free(privname);
 
 	if(!f)
 		return false;
-  
-#ifdef HAVE_FCHMOD
-	/* Make it unreadable for others. */
-	fchmod(fileno(f), 0600);
-#endif
-		
-	rsa_write_pem_private_key(&key, f);
+
+	if(!rsa_write_pem_private_key(key, f)) {
+		fprintf(stderr, "Error writing private key!\n");
+		fclose(f);
+		rsa_free(key);
+		return false;
+	}
 
 	fclose(f);
-	free(filename);
 
 	if(name)
-		xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+		xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 	else
-		xasprintf(&filename, "%s" SLASH "rsa_key.pub", confbase);
+		xasprintf(&pubname, "%s" SLASH "rsa_key.pub", confbase);
 
-	f = ask_and_open(filename, "public RSA key", "a", ask);
+	f = ask_and_open(pubname, "public RSA key", "a", ask, 0666);
+	free(pubname);
 
 	if(!f)
 		return false;
 
-	rsa_write_pem_public_key(&key, f);
+	if(!rsa_write_pem_public_key(key, f)) {
+		fprintf(stderr, "Error writing public key!\n");
+		fclose(f);
+		rsa_free(key);
+		return false;
+	}
 
 	fclose(f);
-	free(filename);
+	rsa_free(key);
 
 	return true;
 }
 
-/*
-  Set all files and paths according to netname
-*/
-static void make_names(void) {
-#ifdef HAVE_MINGW
-	HKEY key;
-	char installdir[1024] = "";
-	long len = sizeof installdir;
-#endif
-
-	if(netname)
-		xasprintf(&identname, "tinc.%s", netname);
-	else
-		identname = xstrdup("tinc");
-
-#ifdef HAVE_MINGW
-	if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
-		if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
-			if(!confbase) {
-				if(netname)
-					xasprintf(&confbase, "%s" SLASH "%s", installdir, netname);
-				else
-					xasprintf(&confbase, "%s", installdir);
-			}
-		}
-		if(!pidfilename)
-			xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
-		RegCloseKey(key);
-	}
-
-	if(!*installdir) {
-#endif
-	confdir = xstrdup(CONFDIR);
-
-	if(!pidfilename)
-		xasprintf(&pidfilename, "%s" SLASH "run" SLASH "%s.pid", LOCALSTATEDIR, identname);
-
-	if(netname) {
-		if(!confbase)
-			xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname);
-		else
-			fprintf(stderr, "Both netname and configuration directory given, using the latter...\n");
-	} else {
-		if(!confbase)
-			xasprintf(&confbase, CONFDIR SLASH "tinc");
-	}
-
-#ifdef HAVE_MINGW
-	} else
-		confdir = xstrdup(installdir);
-#endif
-
-	xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
-	xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
-}
-
-static char buffer[4096];
-static size_t blen = 0;
+char buffer[4096];
+size_t blen = 0;
 
 bool recvline(int fd, char *line, size_t len) {
 	char *newline = NULL;
 
+	if(!fd)
+		abort();
+
 	while(!(newline = memchr(buffer, '\n', blen))) {
 		int result = recv(fd, buffer + blen, sizeof buffer - blen, 0);
 		if(result == -1 && errno == EINTR)
@@ -536,7 +491,10 @@ bool recvline(int fd, char *line, size_t len) {
 	return true;
 }
 
-static bool recvdata(int fd, char *data, size_t len) {
+bool recvdata(int fd, char *data, size_t len) {
+	if(len == -1)
+		len = blen;
+
 	while(blen < len) {
 		int result = recv(fd, buffer + blen, sizeof buffer - blen, 0);
 		if(result == -1 && errno == EINTR)
@@ -579,7 +537,7 @@ bool sendline(int fd, char *format, ...) {
 		blen -= result;
 	}
 
-	return true;	
+	return true;
 }
 
 static void pcap(int fd, FILE *out, int snaplen) {
@@ -686,7 +644,7 @@ static bool remove_service(void) {
 }
 #endif
 
-static bool connect_tincd(bool verbose) {
+bool connect_tincd(bool verbose) {
 	if(fd >= 0) {
 		fd_set r;
 		FD_ZERO(&r);
@@ -708,8 +666,8 @@ static bool connect_tincd(bool verbose) {
 		return false;
 	}
 
-	char host[128];
-	char port[128];
+	char host[129];
+	char port[129];
 
 	if(fscanf(f, "%20d %1024s %128s port %128s", &pid, controlcookie, host, port) != 4) {
 		if(verbose)
@@ -720,14 +678,26 @@ static bool connect_tincd(bool verbose) {
 
 	fclose(f);
 
-#ifdef HAVE_MINGW
-	if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
+#ifndef HAVE_MINGW
+	struct sockaddr_un sa;
+	sa.sun_family = AF_UNIX;
+	strncpy(sa.sun_path, unixsocketname, sizeof sa.sun_path);
+
+	fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if(fd < 0) {
 		if(verbose)
-			fprintf(stderr, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
+			fprintf(stderr, "Cannot create UNIX socket: %s\n", sockstrerror(sockerrno));
 		return false;
 	}
-#endif
 
+	if(connect(fd, (struct sockaddr *)&sa, sizeof sa) < 0) {
+		if(verbose)
+			fprintf(stderr, "Cannot connect to UNIX socket %s: %s\n", unixsocketname, sockstrerror(sockerrno));
+		close(fd);
+		fd = -1;
+		return false;
+	}
+#else
 	struct addrinfo hints = {
 		.ai_family = AF_UNSPEC,
 		.ai_socktype = SOCK_STREAM,
@@ -768,6 +738,7 @@ static bool connect_tincd(bool verbose) {
 	}
 
 	freeaddrinfo(res);
+#endif
 
 	char data[4096];
 	int version;
@@ -781,7 +752,7 @@ static bool connect_tincd(bool verbose) {
 	}
 
 	sendline(fd, "%d ^%s %d", ID, controlcookie, TINC_CTL_VERSION_CURRENT);
-	
+
 	if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &version, &pid) != 3 || code != 4 || version != TINC_CTL_VERSION_CURRENT) {
 		if(verbose)
 			fprintf(stderr, "Could not fully establish control socket connection\n");
@@ -817,9 +788,10 @@ static int cmd_start(int argc, char *argv[]) {
 		c = "tincd";
 
 	int nargc = 0;
-	char **nargv = xmalloc_and_zero((orig_argc + argc) * sizeof *nargv);
+	char **nargv = xzalloc((optind + argc) * sizeof *nargv);
 
-	for(int i = 0; i < orig_argc; i++)
+	nargv[nargc++] = c;
+	for(int i = 1; i < optind; i++)
 		nargv[nargc++] = orig_argv[i];
 	for(int i = 1; i < argc; i++)
 		nargv[nargc++] = argv[i];
@@ -832,14 +804,25 @@ static int cmd_start(int argc, char *argv[]) {
 	pid_t pid = fork();
 	if(pid == -1) {
 		fprintf(stderr, "Could not fork: %s\n", strerror(errno));
+		free(nargv);
 		return 1;
 	}
 
 	if(!pid)
 		exit(execvp(c, nargv));
-	
-	int status = -1;
-	if(waitpid(pid, &status, 0) != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
+
+	free(nargv);
+
+	int status = -1, result;
+#ifdef SIGINT
+	signal(SIGINT, SIG_IGN);
+#endif
+	result = waitpid(pid, &status, 0);
+#ifdef SIGINT
+	signal(SIGINT, SIG_DFL);
+#endif
+
+	if(result != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
 		fprintf(stderr, "Error starting %s\n", c);
 		return 1;
 	}
@@ -849,12 +832,21 @@ static int cmd_start(int argc, char *argv[]) {
 }
 
 static int cmd_stop(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 #ifndef HAVE_MINGW
 	if(!connect_tincd(true)) {
 		if(pid) {
-			if(kill(pid, SIGTERM)) 
+			if(kill(pid, SIGTERM)) {
+				fprintf(stderr, "Could not send TERM signal to process with PID %u: %s\n", pid, strerror(errno));
 				return 1;
+			}
+
 			fprintf(stderr, "Sent TERM signal to process with PID %u.\n", pid);
+			waitpid(pid, NULL, 0);
 			return 0;
 		}
 
@@ -862,9 +854,9 @@ static int cmd_stop(int argc, char *argv[]) {
 	}
 
 	sendline(fd, "%d %d", CONTROL, REQ_STOP);
-	if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_STOP || result) {
-		fprintf(stderr, "Could not stop tinc daemon.\n");
-		return 1;
+
+	while(recvline(fd, line, sizeof line)) {
+		// Wait for tincd to close the connection...
 	}
 #else
 	if(!remove_service())
@@ -878,11 +870,16 @@ static int cmd_stop(int argc, char *argv[]) {
 }
 
 static int cmd_restart(int argc, char *argv[]) {
-	cmd_stop(argc, argv);
+	cmd_stop(1, argv);
 	return cmd_start(argc, argv);
 }
 
 static int cmd_reload(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	if(!connect_tincd(true))
 		return 1;
 
@@ -897,6 +894,19 @@ static int cmd_reload(int argc, char *argv[]) {
 }
 
 static int cmd_dump(int argc, char *argv[]) {
+	bool only_reachable = false;
+
+	if(argc > 2 && !strcasecmp(argv[1], "reachable")) {
+		if(strcasecmp(argv[2], "nodes")) {
+			fprintf(stderr, "`reachable' only supported for nodes.\n");
+			usage(true);
+			return 1;
+		}
+		only_reachable = true;
+		argv++;
+		argc--;
+	}
+
 	if(argc != 2) {
 		fprintf(stderr, "Invalid number of arguments.\n");
 		usage(true);
@@ -950,71 +960,90 @@ static int cmd_dump(int argc, char *argv[]) {
 		if(n < 2)
 			break;
 
-		if(!do_graph) {
-			char node[4096];
-			char from[4096];
-			char to[4096];
-			char subnet[4096];
-			char host[4096];
-			char port[4096];
-			char via[4096];
-			char nexthop[4096];
-			int cipher, digest, maclength, compression, distance, socket, weight;
-			short int pmtu, minmtu, maxmtu;
-			unsigned int options, status;
-			long int last_state_change;
-
-			switch(req) {
-				case REQ_DUMP_NODES: {
-					int n = sscanf(line, "%*d %*d %s %s port %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", node, host, port, &cipher, &digest, &maclength, &compression, &options, &status, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change);
-					if(n != 16) {
-						fprintf(stderr, "Unable to parse node dump from tincd: %s\n", line);
-						return 1;
-					}
+		char node[4096];
+		char from[4096];
+		char to[4096];
+		char subnet[4096];
+		char host[4096];
+		char port[4096];
+		char via[4096];
+		char nexthop[4096];
+		int cipher, digest, maclength, compression, distance, socket, weight;
+		short int pmtu, minmtu, maxmtu;
+		unsigned int options, status_int;
+		node_status_t status;
+		long int last_state_change;
+
+		switch(req) {
+			case REQ_DUMP_NODES: {
+				int n = sscanf(line, "%*d %*d %s %s port %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", node, host, port, &cipher, &digest, &maclength, &compression, &options, &status_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change);
+				if(n != 16) {
+					fprintf(stderr, "Unable to parse node dump from tincd: %s\n", line);
+					return 1;
+				}
+
+				memcpy(&status, &status_int, sizeof status);
+
+				if(do_graph) {
+					const char *color = "black";
+					if(!strcmp(host, "MYSELF"))
+						color = "green";
+					else if(!status.reachable)
+						color = "red";
+					else if(strcmp(via, node))
+						color = "orange";
+					else if(!status.validkey)
+						color = "black";
+					else if(minmtu > 0)
+						color = "green";
+					printf(" %s [label = \"%s\", color = \"%s\"%s];\n", node, node, color, strcmp(host, "MYSELF") ? "" : ", style = \"filled\"");
+				} else {
+					if(only_reachable && !status.reachable)
+						continue;
 					printf("%s at %s port %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)\n",
-							node, host, port, cipher, digest, maclength, compression, options, status, nexthop, via, distance, pmtu, minmtu, maxmtu);
-				} break;
-
-				case REQ_DUMP_EDGES: {
-					int n = sscanf(line, "%*d %*d %s %s %s port %s %x %d", from, to, host, port, &options, &weight);
-					if(n != 6) {
-						fprintf(stderr, "Unable to parse edge dump from tincd.\n");
-						return 1;
-					}
+							node, host, port, cipher, digest, maclength, compression, options, status_int, nexthop, via, distance, pmtu, minmtu, maxmtu);
+				}
+			} break;
+
+			case REQ_DUMP_EDGES: {
+				int n = sscanf(line, "%*d %*d %s %s %s port %s %x %d", from, to, host, port, &options, &weight);
+				if(n != 6) {
+					fprintf(stderr, "Unable to parse edge dump from tincd.\n");
+					return 1;
+				}
+
+				if(do_graph) {
+					float w = 1 + 65536.0 / weight;
+					if(do_graph == 1 && strcmp(node1, node2) > 0)
+						printf(" %s -- %s [w = %f, weight = %f];\n", node1, node2, w, w);
+					else if(do_graph == 2)
+						printf(" %s -> %s [w = %f, weight = %f];\n", node1, node2, w, w);
+				} else {
 					printf("%s to %s at %s port %s options %x weight %d\n", from, to, host, port, options, weight);
-				} break;
-
-				case REQ_DUMP_SUBNETS: {
-					int n = sscanf(line, "%*d %*d %s %s", subnet, node);
-					if(n != 2) {
-						fprintf(stderr, "Unable to parse subnet dump from tincd.\n");
-						return 1;
-					}
-					printf("%s owner %s\n", strip_weight(subnet), node);
-				} break;
-
-				case REQ_DUMP_CONNECTIONS: {
-					int n = sscanf(line, "%*d %*d %s %s port %s %x %d %x", node, host, port, &options, &socket, &status);
-					if(n != 6) {
-						fprintf(stderr, "Unable to parse connection dump from tincd.\n");
-						return 1;
-					}
-					printf("%s at %s port %s options %x socket %d status %x\n", node, host, port, options, socket, status);
-				} break;
-
-				default:
-					fprintf(stderr, "Unable to parse dump from tincd.\n");
+				}
+			} break;
+
+			case REQ_DUMP_SUBNETS: {
+				int n = sscanf(line, "%*d %*d %s %s", subnet, node);
+				if(n != 2) {
+					fprintf(stderr, "Unable to parse subnet dump from tincd.\n");
 					return 1;
-			}
-		} else {
-			if(req == REQ_DUMP_NODES)
-				printf(" %s [label = \"%s\"];\n", node1, node1);
-			else {
-				if(do_graph == 1 && strcmp(node1, node2) > 0)
-					printf(" %s -- %s;\n", node1, node2);
-				else if(do_graph == 2)
-					printf(" %s -> %s;\n", node1, node2);
-			}
+				}
+				printf("%s owner %s\n", strip_weight(subnet), node);
+			} break;
+
+			case REQ_DUMP_CONNECTIONS: {
+				int n = sscanf(line, "%*d %*d %s %s port %s %x %d %x", node, host, port, &options, &socket, &status_int);
+				if(n != 6) {
+					fprintf(stderr, "Unable to parse connection dump from tincd.\n");
+					return 1;
+				}
+				printf("%s at %s port %s options %x socket %d status %x\n", node, host, port, options, socket, status_int);
+			} break;
+
+			default:
+				fprintf(stderr, "Unable to parse dump from tincd.\n");
+				return 1;
 		}
 	}
 
@@ -1023,6 +1052,11 @@ static int cmd_dump(int argc, char *argv[]) {
 }
 
 static int cmd_purge(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	if(!connect_tincd(true))
 		return 1;
 
@@ -1058,6 +1092,11 @@ static int cmd_debug(int argc, char *argv[]) {
 }
 
 static int cmd_retry(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	if(!connect_tincd(true))
 		return 1;
 
@@ -1117,6 +1156,11 @@ static int cmd_disconnect(int argc, char *argv[]) {
 }
 
 static int cmd_top(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 #ifdef HAVE_CURSES
 	if(!connect_tincd(true))
 		return 1;
@@ -1124,12 +1168,17 @@ static int cmd_top(int argc, char *argv[]) {
 	top(fd);
 	return 0;
 #else
-	fprintf(stderr, "This version of tincctl was compiled without support for the curses library.\n");
+	fprintf(stderr, "This version of tinc was compiled without support for the curses library.\n");
 	return 1;
 #endif
 }
 
 static int cmd_pcap(int argc, char *argv[]) {
+	if(argc > 2) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	if(!connect_tincd(true))
 		return 1;
 
@@ -1137,15 +1186,43 @@ static int cmd_pcap(int argc, char *argv[]) {
 	return 0;
 }
 
+#ifdef SIGINT
+static void sigint_handler(int sig) {
+	fprintf(stderr, "\n");
+	shutdown(fd, SHUT_RDWR);
+}
+#endif
+
 static int cmd_log(int argc, char *argv[]) {
+	if(argc > 2) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	if(!connect_tincd(true))
 		return 1;
 
+#ifdef SIGINT
+	signal(SIGINT, sigint_handler);
+#endif
+
 	logcontrol(fd, stdout, argc > 1 ? atoi(argv[1]) : -1);
+
+#ifdef SIGINT
+	signal(SIGINT, SIG_DFL);
+#endif
+
+	close(fd);
+	fd = -1;
 	return 0;
 }
 
 static int cmd_pid(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	if(!connect_tincd(true) && !pid)
 		return 1;
 
@@ -1153,17 +1230,18 @@ static int cmd_pid(int argc, char *argv[]) {
 	return 0;
 }
 
-static int rstrip(char *value) {
+int rstrip(char *value) {
 	int len = strlen(value);
 	while(len && strchr("\t\r\n ", value[len - 1]))
 		value[--len] = 0;
 	return len;
 }
 
-static char *get_my_name() {
+char *get_my_name(bool verbose) {
 	FILE *f = fopen(tinc_conf, "r");
 	if(!f) {
-		fprintf(stderr, "Could not open %s: %s\n", tinc_conf, strerror(errno));
+		if(verbose)
+			fprintf(stderr, "Could not open %s: %s\n", tinc_conf, strerror(errno));
 		return NULL;
 	}
 
@@ -1189,25 +1267,19 @@ static char *get_my_name() {
 	}
 
 	fclose(f);
-	fprintf(stderr, "Could not find Name in %s.\n", tinc_conf);
+	if(verbose)
+		fprintf(stderr, "Could not find Name in %s.\n", tinc_conf);
 	return NULL;
 }
 
-#define VAR_SERVER 1    /* Should be in tinc.conf */
-#define VAR_HOST 2      /* Can be in host config file */
-#define VAR_MULTIPLE 4  /* Multiple statements allowed */
-#define VAR_OBSOLETE 8  /* Should not be used anymore */
-
-static struct {
-	const char *name;
-	int type;
-} const variables[] = {
+const var_t variables[] = {
 	/* Server configuration */
 	{"AddressFamily", VAR_SERVER},
+	{"AutoConnect", VAR_SERVER | VAR_SAFE},
 	{"BindToAddress", VAR_SERVER | VAR_MULTIPLE},
 	{"BindToInterface", VAR_SERVER},
-	{"Broadcast", VAR_SERVER},
-	{"ConnectTo", VAR_SERVER | VAR_MULTIPLE},
+	{"Broadcast", VAR_SERVER | VAR_SAFE},
+	{"ConnectTo", VAR_SERVER | VAR_MULTIPLE | VAR_SAFE},
 	{"DecrementTTL", VAR_SERVER},
 	{"Device", VAR_SERVER},
 	{"DeviceType", VAR_SERVER},
@@ -1215,16 +1287,18 @@ static struct {
 	{"ECDSAPrivateKeyFile", VAR_SERVER},
 	{"ExperimentalProtocol", VAR_SERVER},
 	{"Forwarding", VAR_SERVER},
-	{"GraphDumpFile", VAR_SERVER},
+	{"GraphDumpFile", VAR_SERVER | VAR_OBSOLETE},
 	{"Hostnames", VAR_SERVER},
 	{"IffOneQueue", VAR_SERVER},
 	{"Interface", VAR_SERVER},
 	{"KeyExpire", VAR_SERVER},
+	{"ListenAddress", VAR_SERVER | VAR_MULTIPLE},
 	{"LocalDiscovery", VAR_SERVER},
 	{"MACExpire", VAR_SERVER},
+	{"MaxConnectionBurst", VAR_SERVER},
 	{"MaxOutputBufferSize", VAR_SERVER},
 	{"MaxTimeout", VAR_SERVER},
-	{"Mode", VAR_SERVER},
+	{"Mode", VAR_SERVER | VAR_SAFE},
 	{"Name", VAR_SERVER},
 	{"PingInterval", VAR_SERVER},
 	{"PingTimeout", VAR_SERVER},
@@ -1234,6 +1308,8 @@ static struct {
 	{"ProcessPriority", VAR_SERVER},
 	{"Proxy", VAR_SERVER},
 	{"ReplayWindow", VAR_SERVER},
+	{"ScriptsExtension", VAR_SERVER},
+	{"ScriptsInterpreter", VAR_SERVER},
 	{"StrictSubnets", VAR_SERVER},
 	{"TunnelServer", VAR_SERVER},
 	{"UDPRcvBuf", VAR_SERVER},
@@ -1255,9 +1331,9 @@ static struct {
 	{"Port", VAR_HOST},
 	{"PublicKey", VAR_HOST | VAR_OBSOLETE},
 	{"PublicKeyFile", VAR_SERVER | VAR_HOST | VAR_OBSOLETE},
-	{"Subnet", VAR_HOST | VAR_MULTIPLE},
+	{"Subnet", VAR_HOST | VAR_MULTIPLE | VAR_SAFE},
 	{"TCPOnly", VAR_SERVER | VAR_HOST},
-	{"Weight", VAR_HOST},
+	{"Weight", VAR_HOST | VAR_SAFE},
 	{NULL, 0}
 };
 
@@ -1267,6 +1343,9 @@ static int cmd_config(int argc, char *argv[]) {
 		return 1;
 	}
 
+	if(strcasecmp(argv[0], "config"))
+		argv--, argc++;
+
 	int action = -2;
 	if(!strcasecmp(argv[1], "get")) {
 		argv++, argc--;
@@ -1296,14 +1375,14 @@ static int cmd_config(int argc, char *argv[]) {
 	char *value;
 	int len;
 
-        len = strcspn(line, "\t =");
-        value = line + len;
-        value += strspn(value, "\t ");
-        if(*value == '=') {
-                value++;
-                value += strspn(value, "\t ");
-        }
-        line[len] = '\0';
+	len = strcspn(line, "\t =");
+	value = line + len;
+	value += strspn(value, "\t ");
+	if(*value == '=') {
+		value++;
+		value += strspn(value, "\t ");
+	}
+	line[len] = '\0';
 	variable = strchr(line, '.');
 	if(variable) {
 		node = line;
@@ -1327,6 +1406,7 @@ static int cmd_config(int argc, char *argv[]) {
 
 	/* Some simple checks. */
 	bool found = false;
+	bool warnonremove = false;
 
 	for(int i = 0; variables[i].name; i++) {
 		if(strcasecmp(variables[i].name, variable))
@@ -1360,11 +1440,21 @@ static int cmd_config(int argc, char *argv[]) {
 		/* Should this go into our own host config file? */
 
 		if(!node && !(variables[i].type & VAR_SERVER)) {
-			node = get_my_name();
+			node = get_my_name(true);
 			if(!node)
 				return 1;
 		}
 
+		/* Change "add" into "set" for variables that do not allow multiple occurences.
+		   Turn on warnings when it seems variables might be removed unintentionally. */
+
+		if(action == 1 && !(variables[i].type & VAR_MULTIPLE)) {
+			warnonremove = true;
+			action = 0;
+		} else if(action == 0 && (variables[i].type & VAR_MULTIPLE)) {
+			warnonremove = true;
+		}
+
 		break;
 	}
 
@@ -1391,19 +1481,8 @@ static int cmd_config(int argc, char *argv[]) {
 
 	FILE *f = fopen(filename, "r");
 	if(!f) {
-		if(action < 0 || errno != ENOENT) {
-			fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
-			return 1;
-		}
-
-		// If it doesn't exist, create it.
-		f = fopen(filename, "a+");
-		if(!f) {
-			fprintf(stderr, "Could not create configuration file %s: %s\n", filename, strerror(errno));
-			return 1;
-		} else {
-			fprintf(stderr, "Created configuration file %s.\n", filename);
-		}
+		fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
+		return 1;
 	}
 
 	char *tmpfile = NULL;
@@ -1458,9 +1537,14 @@ static int cmd_config(int argc, char *argv[]) {
 				}
 			// Set
 			} else if(action == 0) {
+				// Warn if "set" was used for variables that can occur multiple times
+				if(warnonremove && strcasecmp(bvalue, value))
+					fprintf(stderr, "Warning: removing %s = %s\n", variable, bvalue);
+
 				// Already set? Delete the rest...
 				if(set)
 					continue;
+
 				// Otherwise, replace.
 				if(fprintf(tf, "%s = %s\n", variable, value) < 0) {
 					fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
@@ -1523,7 +1607,7 @@ static int cmd_config(int argc, char *argv[]) {
 	if(action < 0 && !removed) {
 		remove(tmpfile);
 		fprintf(stderr, "No configuration variables deleted.\n");
-		return *value;
+		return *value != 0;
 	}
 
 	// Replace the configuration file with the new one
@@ -1557,13 +1641,74 @@ bool check_id(const char *name) {
 	return true;
 }
 
+static bool try_bind(int port) {
+	struct addrinfo *ai = NULL;
+	struct addrinfo hint = {
+		.ai_flags = AI_PASSIVE,
+		.ai_family = AF_UNSPEC,
+		.ai_socktype = SOCK_STREAM,
+		.ai_protocol = IPPROTO_TCP,
+	};
+
+	char portstr[16];
+	snprintf(portstr, sizeof portstr, "%d", port);
+
+	if(getaddrinfo(NULL, portstr, &hint, &ai) || !ai)
+		return false;
+
+	while(ai) {
+		int fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+		if(!fd)
+			return false;
+		int result = bind(fd, ai->ai_addr, ai->ai_addrlen);
+		closesocket(fd);
+		if(result)
+			return false;
+		ai = ai->ai_next;
+	}
+
+	return true;
+}
+
+int check_port(char *name) {
+	if(try_bind(655))
+		return 655;
+
+	fprintf(stderr, "Warning: could not bind to port 655. ");
+
+	for(int i = 0; i < 100; i++) {
+		int port = 0x1000 + (rand() & 0x7fff);
+		if(try_bind(port)) {
+			char *filename;
+			xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+			FILE *f = fopen(filename, "a");
+			free(filename);
+			if(!f) {
+				fprintf(stderr, "Please change tinc's Port manually.\n");
+				return 0;
+			}
+
+			fprintf(f, "Port = %d\n", port);
+			fclose(f);
+			fprintf(stderr, "Tinc will instead listen on port %d.\n", port);
+			return port;
+		}
+	}
+
+	fprintf(stderr, "Please change tinc's Port manually.\n");
+	return 0;
+}
+
 static int cmd_init(int argc, char *argv[]) {
 	if(!access(tinc_conf, F_OK)) {
 		fprintf(stderr, "Configuration file %s already exists!\n", tinc_conf);
 		return 1;
 	}
 
-	if(argc < 2) {
+	if(argc > 2) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	} else if(argc < 2) {
 		if(tty) {
 			char buf[1024];
 			fprintf(stdout, "Enter the Name you want your tinc node to have: ");
@@ -1595,17 +1740,17 @@ static int cmd_init(int argc, char *argv[]) {
 		return 1;
 	}
 
-	if(mkdir(confdir, 0755) && errno != EEXIST) {
-		fprintf(stderr, "Could not create directory %s: %s\n", CONFDIR, strerror(errno));
+	if(!confbase_given && mkdir(confdir, 0755) && errno != EEXIST) {
+		fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
 		return 1;
 	}
 
-	if(mkdir(confbase, 0755) && errno != EEXIST) {
+	if(mkdir(confbase, 0777) && errno != EEXIST) {
 		fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
 		return 1;
 	}
 
-	if(mkdir(hosts_dir, 0755) && errno != EEXIST) {
+	if(mkdir(hosts_dir, 0777) && errno != EEXIST) {
 		fprintf(stderr, "Could not create directory %s: %s\n", hosts_dir, strerror(errno));
 		return 1;
 	}
@@ -1622,17 +1767,18 @@ static int cmd_init(int argc, char *argv[]) {
 	if(!rsa_keygen(2048, false) || !ecdsa_keygen(false))
 		return 1;
 
+	check_port(name);
+
 #ifndef HAVE_MINGW
 	char *filename;
 	xasprintf(&filename, "%s" SLASH "tinc-up", confbase);
 	if(access(filename, F_OK)) {
-		FILE *f = fopen(filename, "w");
+		FILE *f = fopenmask(filename, "w", 0777);
 		if(!f) {
 			fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
 			return 1;
 		}
-		fchmod(fileno(f), 0755);
-		fprintf(f, "#!/bin/sh\n\necho 'Unconfigured tinc-up script, please edit!'\n\n#ifconfig $INTERFACE <your vpn IP address> netmask <netmask of whole VPN>\n");
+		fprintf(f, "#!/bin/sh\n\necho 'Unconfigured tinc-up script, please edit '$0'!'\n\n#ifconfig $INTERFACE <your vpn IP address> netmask <netmask of whole VPN>\n");
 		fclose(f);
 	}
 #endif
@@ -1642,14 +1788,38 @@ static int cmd_init(int argc, char *argv[]) {
 }
 
 static int cmd_generate_keys(int argc, char *argv[]) {
+	if(argc > 2) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
+	if(!name)
+		name = get_my_name(false);
+
 	return !(rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true) && ecdsa_keygen(true));
 }
 
 static int cmd_generate_rsa_keys(int argc, char *argv[]) {
+	if(argc > 2) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
+	if(!name)
+		name = get_my_name(false);
+
 	return !rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true);
 }
 
 static int cmd_generate_ecdsa_keys(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
+	if(!name)
+		name = get_my_name(false);
+
 	return !ecdsa_keygen(true);
 }
 
@@ -1659,6 +1829,11 @@ static int cmd_help(int argc, char *argv[]) {
 }
 
 static int cmd_version(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	version();
 	return 0;
 }
@@ -1761,14 +1936,29 @@ static int export(const char *name, FILE *out) {
 }
 
 static int cmd_export(int argc, char *argv[]) {
-	char *name = get_my_name();
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
+	char *name = get_my_name(true);
 	if(!name)
 		return 1;
 
-	return export(name, stdout);
+	int result = export(name, stdout);
+	if(!tty)
+		fclose(stdout);
+
+	free(name);
+	return result;
 }
 
 static int cmd_export_all(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	DIR *dir = opendir(hosts_dir);
 	if(!dir) {
 		fprintf(stderr, "Could not open host configuration directory %s: %s\n", hosts_dir, strerror(errno));
@@ -1792,21 +1982,30 @@ static int cmd_export_all(int argc, char *argv[]) {
 	}
 
 	closedir(dir);
+	if(!tty)
+		fclose(stdout);
 	return result;
 }
 
 static int cmd_import(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	FILE *in = stdin;
 	FILE *out = NULL;
 
 	char buf[4096];
 	char name[4096];
-	char *filename;
+	char *filename = NULL;
 	int count = 0;
 	bool firstline = true;
 
 	while(fgets(buf, sizeof buf, in)) {
 		if(sscanf(buf, "Name = %s", name) == 1) {
+			firstline = false;
+
 			if(!check_id(name)) {
 				fprintf(stderr, "Invalid Name in input!\n");
 				return 1;
@@ -1831,7 +2030,6 @@ static int cmd_import(int argc, char *argv[]) {
 			}
 
 			count++;
-			firstline = false;
 			continue;
 		} else if(firstline) {
 			fprintf(stderr, "Junk at the beginning of the input, ignoring.\n");
@@ -1862,9 +2060,18 @@ static int cmd_import(int argc, char *argv[]) {
 	}
 }
 
+static int cmd_exchange(int argc, char *argv[]) {
+	return cmd_export(argc, argv) ?: cmd_import(argc, argv);
+}
+
+static int cmd_exchange_all(int argc, char *argv[]) {
+	return cmd_export_all(argc, argv) ?: cmd_import(argc, argv);
+}
+
 static const struct {
 	const char *command;
 	int (*function)(int argc, char *argv[]);
+	bool hidden;
 } commands[] = {
 	{"start", cmd_start},
 	{"stop", cmd_stop},
@@ -1880,7 +2087,11 @@ static const struct {
 	{"pcap", cmd_pcap},
 	{"log", cmd_log},
 	{"pid", cmd_pid},
-	{"config", cmd_config},
+	{"config", cmd_config, true},
+	{"add", cmd_config},
+	{"del", cmd_config},
+	{"get", cmd_config},
+	{"set", cmd_config},
 	{"init", cmd_init},
 	{"generate-keys", cmd_generate_keys},
 	{"generate-rsa-keys", cmd_generate_rsa_keys},
@@ -1892,6 +2103,10 @@ static const struct {
 	{"export", cmd_export},
 	{"export-all", cmd_export_all},
 	{"import", cmd_import},
+	{"exchange", cmd_exchange},
+	{"exchange-all", cmd_exchange_all},
+	{"invite", cmd_invite},
+	{"join", cmd_join},
 	{NULL, NULL},
 };
 
@@ -1905,7 +2120,7 @@ static char *complete_command(const char *text, int state) {
 		i++;
 
 	while(commands[i].command) {
-		if(!strncasecmp(commands[i].command, text, strlen(text)))
+		if(!commands[i].hidden && !strncasecmp(commands[i].command, text, strlen(text)))
 			return xstrdup(commands[i].command);
 		i++;
 	}
@@ -1914,7 +2129,7 @@ static char *complete_command(const char *text, int state) {
 }
 
 static char *complete_dump(const char *text, int state) {
-	const char *matches[] = {"nodes", "edges", "subnets", "connections", "graph", NULL};
+	const char *matches[] = {"reachable", "nodes", "edges", "subnets", "connections", "graph", NULL};
 	static int i;
 
 	if(!state)
@@ -1932,42 +2147,24 @@ static char *complete_dump(const char *text, int state) {
 }
 
 static char *complete_config(const char *text, int state) {
-	const char *sub[] = {"get", "set", "add", "del"};
 	static int i;
-	if(!state) {
+
+	if(!state)
 		i = 0;
-		if(!strchr(rl_line_buffer + 7, ' '))
-			i = -4;
-		else {
-			bool found = false;
-			for(int i = 0; i < 4; i++) {
-				if(!strncasecmp(rl_line_buffer + 7, sub[i], strlen(sub[i])) && rl_line_buffer[7 + strlen(sub[i])] == ' ') {
-					found = true;
-					break;
-				}
-			}
-			if(!found)
-				return NULL;
-		}
-	} else {
+	else
 		i++;
-	}
 
-	while(i < 0 || variables[i].name) {
-		if(i < 0 && !strncasecmp(sub[i + 4], text, strlen(text)))
-			return xstrdup(sub[i + 4]);
-		if(i >= 0) {
-			char *dot = strchr(text, '.');
-			if(dot) {
-				if((variables[i].type & VAR_HOST) && !strncasecmp(variables[i].name, dot + 1, strlen(dot + 1))) {
-					char *match;
-					xasprintf(&match, "%.*s.%s", dot - text, text, variables[i].name);
-					return match;
-				}
-			} else {
-				if(!strncasecmp(variables[i].name, text, strlen(text)))
-					return xstrdup(variables[i].name);
+	while(variables[i].name) {
+		char *dot = strchr(text, '.');
+		if(dot) {
+			if((variables[i].type & VAR_HOST) && !strncasecmp(variables[i].name, dot + 1, strlen(dot + 1))) {
+				char *match;
+				xasprintf(&match, "%.*s.%s", (int)(dot - text), text, variables[i].name);
+				return match;
 			}
+		} else {
+			if(!strncasecmp(variables[i].name, text, strlen(text)))
+				return xstrdup(variables[i].name);
 		}
 		i++;
 	}
@@ -2020,7 +2217,13 @@ static char **completion (const char *text, int start, int end) {
 		matches = rl_completion_matches(text, complete_command);
 	else if(!strncasecmp(rl_line_buffer, "dump ", 5))
 		matches = rl_completion_matches(text, complete_dump);
-	else if(!strncasecmp(rl_line_buffer, "config ", 7))
+	else if(!strncasecmp(rl_line_buffer, "add ", 4))
+		matches = rl_completion_matches(text, complete_config);
+	else if(!strncasecmp(rl_line_buffer, "del ", 4))
+		matches = rl_completion_matches(text, complete_config);
+	else if(!strncasecmp(rl_line_buffer, "get ", 4))
+		matches = rl_completion_matches(text, complete_config);
+	else if(!strncasecmp(rl_line_buffer, "set ", 4))
 		matches = rl_completion_matches(text, complete_config);
 	else if(!strncasecmp(rl_line_buffer, "info ", 5))
 		matches = rl_completion_matches(text, complete_info);
@@ -2037,7 +2240,6 @@ static int cmd_shell(int argc, char *argv[]) {
 	char *line = NULL;
 	int maxargs = argc + 16;
 	char **nargv = xmalloc(maxargs * sizeof *nargv);
-	optind = argc;
 
 	for(int i = 0; i < argc; i++)
 		nargv[i] = argv[i];
@@ -2123,6 +2325,8 @@ static int cmd_shell(int argc, char *argv[]) {
 		}
 	}
 
+	free(nargv);
+
 	if(tty)
 		printf("\n");
 	return result;
@@ -2136,8 +2340,10 @@ int main(int argc, char *argv[]) {
 
 	if(!parse_options(argc, argv))
 		return 1;
-	
+
 	make_names();
+	xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
+	xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
 
 	if(show_version) {
 		version();
@@ -2149,6 +2355,18 @@ int main(int argc, char *argv[]) {
 		return 0;
 	}
 
+#ifdef HAVE_MINGW
+	static struct WSAData wsa_state;
+
+	if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
+		fprintf(stderr, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
+		return false;
+	}
+#endif
+
+	srand(time(NULL));
+	crypto_init();
+
 	tty = isatty(0) && isatty(1);
 
 	if(optind >= argc)