X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=39bd326d5850966ff5280dc2555db33eafa20acf;hb=6396f42d74f22ab5f8e736dc5cb04c57917f9319;hp=b2a6561f1654eb80955ba12fd4e7577708fc0a8f;hpb=439069bda62b25baaabeb765ac0557efa57b6cfb;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index b2a6561f..39bd326d 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -25,11 +25,16 @@
 #include "protocol.h"
 #include "control_common.h"
 #include "ecdsagen.h"
+#include "info.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;
 
@@ -42,6 +47,7 @@ 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;
@@ -55,6 +61,7 @@ static char line[4096];
 static int code;
 static int req;
 static int result;
+static bool force = false;
 
 #ifdef HAVE_MINGW
 static struct WSAData wsa_state;
@@ -62,10 +69,19 @@ static struct WSAData wsa_state;
 
 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},
 	{NULL, 0, NULL, 0}
 };
 
@@ -95,10 +111,11 @@ static void usage(bool status) {
 				"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"
-				"  start                      Start tincd.\n"
+				"  start [tincd options]      Start tincd.\n"
 				"  stop                       Stop tincd.\n"
 				"  restart                    Restart tincd.\n"
 				"  reload                     Partially reload configuration of running tincd.\n"
@@ -112,6 +129,7 @@ static void usage(bool status) {
 				"    subnets                  - all known subnets in the VPN\n"
 				"    connections              - all meta connections with ourself\n"
 				"    graph                    - graph of the VPN in dotty format\n"
+				"  info NODE|SUBNET|ADDRESS   Give information about a particular NODE, SUBNET or ADDRESS.\n"
 				"  purge                      Purge unreachable nodes\n"
 				"  debug N                    Set debug level\n"
 				"  retry                      Retry all outgoing connections\n"
@@ -121,6 +139,9 @@ static void usage(bool status) {
 #endif
 				"  pcap [snaplen]             Dump traffic in pcap format [up to snaplen bytes per packet]\n"
 				"  log [level]                Dump log output [up to the specified level]\n"
+				"  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"
 				"\n");
 		printf("Report bugs to tinc@tinc-vpn.org.\n");
 	}
@@ -130,7 +151,7 @@ static bool parse_options(int argc, char **argv) {
 	int r;
 	int option_index = 0;
 
-	while((r = getopt_long(argc, argv, "c:n:", long_options, &option_index)) != EOF) {
+	while((r = getopt_long(argc, argv, "c:n:Dd::Lo:RU:", long_options, &option_index)) != EOF) {
 		switch (r) {
 			case 0:				/* long option */
 				break;
@@ -155,6 +176,10 @@ static bool parse_options(int argc, char **argv) {
 				pidfilename = xstrdup(optarg);
 				break;
 
+			case 6:
+				force = true;
+				break;
+
 			case '?':
 				usage(true);
 				return false;
@@ -164,10 +189,19 @@ static bool parse_options(int argc, char **argv) {
 		}
 	}
 
-	if(!netname) {
-		netname = getenv("NETNAME");
-		if(netname)
-			netname = xstrdup(netname);
+        if(!netname && (netname = getenv("NETNAME")))
+                netname = xstrdup(netname);
+
+        /* netname "." is special: a "top-level name" */
+
+        if(netname && (!*netname || !strcmp(netname, "."))) {
+                free(netname);
+                netname = NULL;
+        }
+
+	if(netname && (strpbrk(netname, "\\/") || *netname == '.')) {
+		fprintf(stderr, "Invalid character in netname!\n");
+		return false;
 	}
 
 	return true;
@@ -207,7 +241,7 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
 #endif
 		/* The directory is a relative path or a filename. */
 		directory = get_current_dir_name();
-		snprintf(buf2, sizeof buf2, "%s/%s", directory, filename);
+		snprintf(buf2, sizeof buf2, "%s" SLASH "%s", directory, filename);
 		filename = buf2;
 	}
 
@@ -242,7 +276,7 @@ static bool ecdsa_keygen() {
 	} else
 		fprintf(stderr, "Done.\n");
 
-	xasprintf(&filename, "%s/ecdsa_key.priv", confbase);
+	xasprintf(&filename, "%s" SLASH "ecdsa_key.priv", confbase);
 	f = ask_and_open(filename, "private ECDSA key", "a");
 
 	if(!f)
@@ -262,9 +296,9 @@ static bool ecdsa_keygen() {
 	free(filename);
 
 	if(name)
-		xasprintf(&filename, "%s/hosts/%s", confbase, name);
+		xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 	else
-		xasprintf(&filename, "%s/ecdsa_key.pub", confbase);
+		xasprintf(&filename, "%s" SLASH "ecdsa_key.pub", confbase);
 
 	f = ask_and_open(filename, "public ECDSA key", "a");
 
@@ -301,7 +335,7 @@ static bool rsa_keygen(int bits) {
 	} else
 		fprintf(stderr, "Done.\n");
 
-	xasprintf(&filename, "%s/rsa_key.priv", confbase);
+	xasprintf(&filename, "%s" SLASH "rsa_key.priv", confbase);
 	f = ask_and_open(filename, "private RSA key", "a");
 
 	if(!f)
@@ -321,9 +355,9 @@ static bool rsa_keygen(int bits) {
 	free(filename);
 
 	if(name)
-		xasprintf(&filename, "%s/hosts/%s", confbase, name);
+		xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 	else
-		xasprintf(&filename, "%s/rsa_key.pub", confbase);
+		xasprintf(&filename, "%s" SLASH "rsa_key.pub", confbase);
 
 	f = ask_and_open(filename, "public RSA key", "a");
 
@@ -361,38 +395,40 @@ static void make_names(void) {
 		if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
 			if(!confbase) {
 				if(netname)
-					xasprintf(&confbase, "%s/%s", installdir, netname);
+					xasprintf(&confbase, "%s" SLASH "%s", installdir, netname);
 				else
 					xasprintf(&confbase, "%s", installdir);
 			}
 		}
 		if(!pidfilename)
-			xasprintf(&pidfilename, "%s/pid", confbase);
+			xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
 		RegCloseKey(key);
 	}
 
 	if(!*installdir) {
 #endif
+	confdir = xstrdup(CONFDIR);
 
 	if(!pidfilename)
-		xasprintf(&pidfilename, "%s/run/%s.pid", LOCALSTATEDIR, identname);
+		xasprintf(&pidfilename, "%s" SLASH "run" SLASH "%s.pid", LOCALSTATEDIR, identname);
 
 	if(netname) {
 		if(!confbase)
-			xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
+			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 "/tinc");
+			xasprintf(&confbase, CONFDIR SLASH "tinc");
 	}
 
 #ifdef HAVE_MINGW
-	}
+	} else
+		confdir = xstrdup(installdir);
 #endif
 
-	xasprintf(&tinc_conf, "%s/tinc.conf", confbase);
-	xasprintf(&hosts_dir, "%s/hosts", confbase);
+	xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
+	xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
 }
 
 static char buffer[4096];
@@ -655,6 +691,9 @@ static bool connect_tincd() {
 static int cmd_start(int argc, char *argv[]) {
 	int i, j;
 	char *c;
+
+	argc += optind;
+	argv -= optind;
 	char *slash = strrchr(argv[0], '/');
 
 #ifdef HAVE_MINGW
@@ -662,10 +701,8 @@ static int cmd_start(int argc, char *argv[]) {
 		slash = c;
 #endif
 
-	if (slash++) {
-		c = xmalloc((slash - argv[0]) + sizeof("tincd"));
-		sprintf(c, "%.*stincd", (int)(slash - argv[0]), argv[0]);
-	}
+	if (slash++)
+		xasprintf(&c, "%.*stincd", (int)(slash - argv[0]), argv[0]);
 	else
 		c = "tincd";
 
@@ -683,8 +720,16 @@ static int cmd_start(int argc, char *argv[]) {
 
 static int cmd_stop(int argc, char *argv[]) {
 #ifndef HAVE_MINGW
-	if(!connect_tincd())
+	if(!connect_tincd()) {
+		if(pid) {
+			if(kill(pid, SIGTERM)) 
+				return 1;
+			fprintf(stderr, "Sent TERM signal to process with PID %u.\n", pid);
+			return 0;
+		}
+
 		return 1;
+	}
 
 	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) {
@@ -699,7 +744,8 @@ static int cmd_stop(int argc, char *argv[]) {
 }
 
 static int cmd_restart(int argc, char *argv[]) {
-	return cmd_stop(argc, argv) ?: cmd_start(argc, argv);
+	cmd_stop(argc, argv);
+	return cmd_start(argc, argv);
 }
 
 static int cmd_reload(int argc, char *argv[]) {
@@ -723,6 +769,9 @@ static int cmd_dump(int argc, char *argv[]) {
 		return 1;
 	}
 
+	if(!connect_tincd())
+		return 1;
+
 	bool do_graph = false;
 
 	if(!strcasecmp(argv[1], "nodes"))
@@ -743,9 +792,6 @@ static int cmd_dump(int argc, char *argv[]) {
 		return 1;
 	}
 
-	if(!connect_tincd())
-		return 1;
-
 	if(do_graph)
 		printf("digraph {\n");
 
@@ -902,7 +948,7 @@ static int cmd_log(int argc, char *argv[]) {
 }
 
 static int cmd_pid(int argc, char *argv[]) {
-	if(!connect_tincd())
+	if(!connect_tincd() && !pid)
 		return 1;
 
 	printf("%d\n", pid);
@@ -949,12 +995,72 @@ static char *get_my_name() {
 	return NULL;
 }
 
-static char *hostvariables[] = {
-	"Address",
-	"Port",
-	"PublicKey",
-	"Subnet",
-	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[] = {
+	/* Server configuration */
+	{"AddressFamily", VAR_SERVER},
+	{"BindToAddress", VAR_SERVER | VAR_MULTIPLE},
+	{"BindToInterface", VAR_SERVER},
+	{"Broadcast", VAR_SERVER},
+	{"ConnectTo", VAR_SERVER | VAR_MULTIPLE},
+	{"DecrementTTL", VAR_SERVER},
+	{"Device", VAR_SERVER},
+	{"DeviceType", VAR_SERVER},
+	{"DirectOnly", VAR_SERVER},
+	{"ECDSAPrivateKeyFile", VAR_SERVER},
+	{"ExperimentalProtocol", VAR_SERVER},
+	{"Forwarding", VAR_SERVER},
+	{"GraphDumpFile", VAR_SERVER},
+	{"Hostnames", VAR_SERVER},
+	{"IffOneQueue", VAR_SERVER},
+	{"Interface", VAR_SERVER},
+	{"KeyExpire", VAR_SERVER},
+	{"LocalDiscovery", VAR_SERVER},
+	{"MACExpire", VAR_SERVER},
+	{"MaxOutputBufferSize", VAR_SERVER},
+	{"MaxTimeout", VAR_SERVER},
+	{"Mode", VAR_SERVER},
+	{"Name", VAR_SERVER},
+	{"PingInterval", VAR_SERVER},
+	{"PingTimeout", VAR_SERVER},
+	{"PriorityInheritance", VAR_SERVER},
+	{"PrivateKey", VAR_SERVER | VAR_OBSOLETE},
+	{"PrivateKeyFile", VAR_SERVER},
+	{"ProcessPriority", VAR_SERVER},
+	{"Proxy", VAR_SERVER},
+	{"ReplayWindow", VAR_SERVER},
+	{"StrictSubnets", VAR_SERVER},
+	{"TunnelServer", VAR_SERVER},
+	{"UDPRcvBuf", VAR_SERVER},
+	{"UDPSndBuf", VAR_SERVER},
+	{"VDEGroup", VAR_SERVER},
+	{"VDEPort", VAR_SERVER},
+	/* Host configuration */
+	{"Address", VAR_HOST | VAR_MULTIPLE},
+	{"Cipher", VAR_SERVER | VAR_HOST},
+	{"ClampMSS", VAR_SERVER | VAR_HOST},
+	{"Compression", VAR_SERVER | VAR_HOST},
+	{"Digest", VAR_SERVER | VAR_HOST},
+	{"ECDSAPublicKey", VAR_HOST},
+	{"ECDSAPublicKeyFile", VAR_SERVER | VAR_HOST},
+	{"IndirectData", VAR_SERVER | VAR_HOST},
+	{"MACLength", VAR_SERVER | VAR_HOST},
+	{"PMTU", VAR_SERVER | VAR_HOST},
+	{"PMTUDiscovery", VAR_SERVER | VAR_HOST},
+	{"Port", VAR_HOST},
+	{"PublicKey", VAR_HOST | VAR_OBSOLETE},
+	{"PublicKeyFile", VAR_SERVER | VAR_HOST | VAR_OBSOLETE},
+	{"Subnet", VAR_HOST | VAR_MULTIPLE},
+	{"TCPOnly", VAR_SERVER | VAR_HOST},
+	{"Weight", VAR_HOST},
+	{NULL, 0}
 };
 
 static int cmd_config(int argc, char *argv[]) {
@@ -963,8 +1069,10 @@ static int cmd_config(int argc, char *argv[]) {
 		return 1;
 	}
 
-	int action = 0;
-	if(!strcasecmp(argv[1], "add")) {
+	int action = -2;
+	if(!strcasecmp(argv[1], "get")) {
+		argv++, argc--;
+	} else if(!strcasecmp(argv[1], "add")) {
 		argv++, argc--, action = 1;
 	} else if(!strcasecmp(argv[1], "del")) {
 		argv++, argc--, action = -1;
@@ -1016,16 +1124,50 @@ static int cmd_config(int argc, char *argv[]) {
 		return 1;
 	}
 
-	// Should this go into our own host config file?
-	if(!node) {
-		for(int i = 0; hostvariables[i]; i++) {
-			if(!strcasecmp(hostvariables[i], variable)) {
-				node = get_my_name();
-				if(!node)
-					return 1;
-				break;
+	if(action < -1 && *value)
+		action = 0;
+
+	/* Some simple checks. */
+	bool found = false;
+
+	for(int i = 0; variables[i].name; i++) {
+		if(strcasecmp(variables[i].name, variable))
+			continue;
+
+		found = true;
+		variable = (char *)variables[i].name;
+
+		/* Discourage use of obsolete variables. */
+
+		if(variables[i].type & VAR_OBSOLETE && action >= 0) {
+			if(force) {
+				fprintf(stderr, "Warning: %s is an obsolete variable!\n", variable);
+			} else {
+				fprintf(stderr, "%s is an obsolete variable! Use --force to use it anyway.\n", variable);
+				return 1;
+			}
+		}
+
+		/* Don't put server variables in host config files */
+
+		if(node && !(variables[i].type & VAR_HOST) && action >= 0) {
+			if(force) {
+				fprintf(stderr, "Warning: %s is not a host configuration variable!\n", variable);
+			} else {
+				fprintf(stderr, "%s is not a host configuration variable! Use --force to use it anyway.\n", variable);
+				return 1;
 			}
 		}
+
+		/* Should this go into our own host config file? */
+
+		if(!node && !(variables[i].type & VAR_SERVER)) {
+			node = get_my_name();
+			if(!node)
+				return 1;
+		}
+
+		break;
 	}
 
 	if(node && !check_id(node)) {
@@ -1033,10 +1175,19 @@ static int cmd_config(int argc, char *argv[]) {
 		return 1;
 	}
 
+	if(!found) {
+		if(force || action < 0) {
+			fprintf(stderr, "Warning: %s is not a known configuration variable!\n", variable);
+		} else {
+			fprintf(stderr, "%s: is not a known configuration variable! Use --force to use it anyway.\n", variable);
+			return 1;
+		}
+	}
+
 	// Open the right configuration file.
 	char *filename;
 	if(node)
-		xasprintf(&filename, "%s/%s", hosts_dir, node);
+		xasprintf(&filename, "%s" SLASH "%s", hosts_dir, node);
 	else
 		filename = tinc_conf;
 
@@ -1057,23 +1208,28 @@ static int cmd_config(int argc, char *argv[]) {
 		}
 	}
 
-	char *tmpfile;
-	xasprintf(&tmpfile, "%s.config.tmp", filename);
-	FILE *tf = fopen(tmpfile, "w");
-	if(!tf) {
-		fprintf(stderr, "Could not open temporary file %s: %s\n", tmpfile, strerror(errno));
-		return 1;
+	char *tmpfile = NULL;
+	FILE *tf = NULL;
+
+	if(action >= -1) {
+		xasprintf(&tmpfile, "%s.config.tmp", filename);
+		tf = fopen(tmpfile, "w");
+		if(!tf) {
+			fprintf(stderr, "Could not open temporary file %s: %s\n", tmpfile, strerror(errno));
+			return 1;
+		}
 	}
 
-	// Copy the file, making modifications on the fly.
+	// Copy the file, making modifications on the fly, unless we are just getting a value.
 	char buf1[4096];
 	char buf2[4096];
 	bool set = false;
 	bool removed = false;
+	found = false;
 
 	while(fgets(buf1, sizeof buf1, f)) {
 		buf1[sizeof buf1 - 1] = 0;
-		strcpy(buf2, buf1);
+		strncpy(buf2, buf1, sizeof buf2);
 
 		// Parse line in a simple way
 		char *bvalue;
@@ -1091,8 +1247,12 @@ static int cmd_config(int argc, char *argv[]) {
 
 		// Did it match?
 		if(!strcasecmp(buf2, variable)) {
+			// Get
+			if(action < -1) {
+				found = true;
+				printf("%s\n", bvalue);
 			// Del
-			if(action < 0) {
+			} else if(action == -1) {
 				if(!*value || !strcasecmp(bvalue, value)) {
 					removed = true;
 					continue;
@@ -1112,10 +1272,20 @@ static int cmd_config(int argc, char *argv[]) {
 			}
 		}
 
-		// Copy original line...
-		if(fputs(buf1, tf) < 0) {
-			fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
-			return 1;
+		if(action >= -1) {
+			// Copy original line...
+			if(fputs(buf1, tf) < 0) {
+				fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
+				return 1;
+			}
+
+			// Add newline if it is missing...
+			if(*buf1 && buf1[strlen(buf1) - 1] != '\n') {
+				if(fputc('\n', tf) < 0) {
+					fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
+					return 1;
+				}
+			}
 		}
 	}
 
@@ -1138,6 +1308,12 @@ static int cmd_config(int argc, char *argv[]) {
 		}
 	}
 
+	if(action < -1) {
+		if(!found)
+			fprintf(stderr, "No matching configuration variables found.\n");
+		return 0;
+	}
+
 	// Make sure we wrote everything...
 	if(fclose(tf)) {
 		fprintf(stderr, "Error closing temporary file %s: %s\n", tmpfile, strerror(errno));
@@ -1173,6 +1349,9 @@ static int cmd_config(int argc, char *argv[]) {
 }
 
 bool check_id(const char *name) {
+	if(!name || !*name)
+		return false;
+
 	for(int i = 0; i < strlen(name); i++) {
 		if(!isalnum(name[i]) && name[i] != '_')
 			return false;
@@ -1219,7 +1398,7 @@ static int cmd_init(int argc, char *argv[]) {
 		return 1;
 	}
 
-	if(mkdir(CONFDIR, 0755) && errno != EEXIST) {
+	if(mkdir(confdir, 0755) && errno != EEXIST) {
 		fprintf(stderr, "Could not create directory %s: %s\n", CONFDIR, strerror(errno));
 		return 1;
 	}
@@ -1229,8 +1408,6 @@ static int cmd_init(int argc, char *argv[]) {
 		return 1;
 	}
 
-	char *hosts_dir = NULL;
-	xasprintf(&hosts_dir, "%s/hosts", confbase);
 	if(mkdir(hosts_dir, 0755) && errno != EEXIST) {
 		fprintf(stderr, "Could not create directory %s: %s\n", hosts_dir, strerror(errno));
 		return 1;
@@ -1247,9 +1424,24 @@ static int cmd_init(int argc, char *argv[]) {
 
 	fclose(stdin);
 	if(!rsa_keygen(2048) || !ecdsa_keygen())
-		return false;
+		return 1;
 
-	return true;
+#ifndef HAVE_MINGW
+	char *filename;
+	xasprintf(&filename, "%s" SLASH "tinc-up", confbase);
+	if(access(filename, F_OK)) {
+		FILE *f = fopen(filename, "w");
+		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");
+		fclose(f);
+	}
+#endif
+
+	return 0;
 
 }
 
@@ -1275,6 +1467,18 @@ static int cmd_version(int argc, char *argv[]) {
 	return 0;
 }
 
+static int cmd_info(int argc, char *argv[]) {
+	if(argc != 2) {
+		fprintf(stderr, "Invalid number of arguments.\n");
+		return 1;
+	}
+
+	if(!connect_tincd())
+		return 1;
+
+	return info(fd, argv[1]);
+}
+
 static const char *conffiles[] = {
 	"tinc.conf",
 	"tinc-up",
@@ -1294,10 +1498,10 @@ static int cmd_edit(int argc, char *argv[]) {
 
 	char *filename = NULL;
 
-	if(strncmp(argv[1], "hosts/", 6)) {
+	if(strncmp(argv[1], "hosts" SLASH, 6)) {
 		for(int i = 0; conffiles[i]; i++) {
 			if(!strcmp(argv[1], conffiles[i])) {
-				xasprintf(&filename, "%s/%s", confbase, argv[1]);
+				xasprintf(&filename, "%s" SLASH "%s", confbase, argv[1]);
 				break;
 			}
 		}
@@ -1306,7 +1510,7 @@ static int cmd_edit(int argc, char *argv[]) {
 	}
 
 	if(!filename) {
-		xasprintf(&filename, "%s/%s", hosts_dir, argv[1]);
+		xasprintf(&filename, "%s" SLASH "%s", hosts_dir, argv[1]);
 		char *dash = strchr(argv[1], '-');
 		if(dash) {
 			*dash++ = 0;
@@ -1317,14 +1521,12 @@ static int cmd_edit(int argc, char *argv[]) {
 		}
 	}
 
+	char *command;
 #ifndef HAVE_MINGW
-	char *editor = getenv("VISUAL") ?: getenv("EDITOR") ?: "vi";
+	xasprintf(&command, "\"%s\" \"%s\"", getenv("VISUAL") ?: getenv("EDITOR") ?: "vi", filename);
 #else
-	char *editor = "edit"
+	xasprintf(&command, "edit \"%s\"", filename);
 #endif
-
-	char *command;
-	xasprintf(&command, "\"%s\" \"%s\"", editor, filename);
 	int result = system(command);
 	if(result)
 		return result;
@@ -1338,6 +1540,133 @@ static int cmd_edit(int argc, char *argv[]) {
 	return 0;
 }
 
+static int export(const char *name, FILE *out) {
+	char *filename;
+	xasprintf(&filename, "%s" SLASH "%s", hosts_dir, name);
+	FILE *in = fopen(filename, "r");
+	if(!in) {
+		fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
+		return 1;
+	}
+
+	fprintf(out, "Name = %s\n", name);
+	char buf[4096];
+	while(fgets(buf, sizeof buf, in)) {
+		if(strcspn(buf, "\t =") != 4 || strncasecmp(buf, "Name", 4))
+			fputs(buf, out);
+	}
+
+	if(ferror(in)) {
+		fprintf(stderr, "Error while reading configuration file %s: %s\n", filename, strerror(errno));
+		return 1;
+	}
+
+	fclose(in);
+	return 0;
+}
+
+static int cmd_export(int argc, char *argv[]) {
+	char *name = get_my_name();
+	if(!name)
+		return 1;
+
+	return export(name, stdout);
+}
+
+static int cmd_export_all(int argc, char *argv[]) {
+	DIR *dir = opendir(hosts_dir);
+	if(!dir) {
+		fprintf(stderr, "Could not open host configuration directory %s: %s\n", hosts_dir, strerror(errno));
+		return 1;
+	}
+
+	bool first = true;
+	int result = 0;
+	struct dirent *ent;
+
+	while((ent = readdir(dir))) {
+		if(!check_id(ent->d_name))
+			continue;
+
+		if(first)
+			first = false;
+		else
+			printf("#---------------------------------------------------------------#\n");
+
+		result |= export(ent->d_name, stdout);
+	}
+
+	closedir(dir);
+	return result;
+}
+
+static int cmd_import(int argc, char *argv[]) {
+	FILE *in = stdin;
+	FILE *out = NULL;
+
+	char buf[4096];
+	char name[4096];
+	char *filename;
+	int count = 0;
+	bool firstline = true;
+
+	while(fgets(buf, sizeof buf, in)) {
+		if(sscanf(buf, "Name = %s", name) == 1) {
+			if(!check_id(name)) {
+				fprintf(stderr, "Invalid Name in input!\n");
+				return 1;
+			}
+
+			if(out)
+				fclose(out);
+
+			free(filename);
+			xasprintf(&filename, "%s" SLASH "%s", hosts_dir, name);
+
+			if(!force && !access(filename, F_OK)) {
+				fprintf(stderr, "Host configuration file %s already exists, skipping.\n", filename);
+				out = NULL;
+				continue;
+			}
+
+			out = fopen(filename, "w");
+			if(!out) {
+				fprintf(stderr, "Error creating configuration file %s: %s\n", filename, strerror(errno));
+				return 1;
+			}
+
+			count++;
+			firstline = false;
+			continue;
+		} else if(firstline) {
+			fprintf(stderr, "Junk at the beginning of the input, ignoring.\n");
+			firstline = false;
+		}
+
+
+		if(!strcmp(buf, "#---------------------------------------------------------------#\n"))
+			continue;
+
+		if(out) {
+			if(fputs(buf, out) < 0) {
+				fprintf(stderr, "Error writing to host configuration file %s: %s\n", filename, strerror(errno));
+				return 1;
+			}
+		}
+	}
+
+	if(out)
+		fclose(out);
+
+	if(count) {
+		fprintf(stderr, "Imported %d host configuration files.\n", count);
+		return 0;
+	} else {
+		fprintf(stderr, "No host configuration files imported.\n");
+		return 1;
+	}
+}
+
 static const struct {
 	const char *command;
 	int (*function)(int argc, char *argv[]);
@@ -1363,7 +1692,11 @@ static const struct {
 	{"generate-ecdsa-keys", cmd_generate_ecdsa_keys},
 	{"help", cmd_help},
 	{"version", cmd_version},
+	{"info", cmd_info},
 	{"edit", cmd_edit},
+	{"export", cmd_export},
+	{"export-all", cmd_export_all},
+	{"import", cmd_import},
 	{NULL, NULL},
 };