X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincctl.c;h=f3a73b77dd3e44e25979bd649d2ec548a7e9a265;hp=63b758955cd895472a913fbbdbda1ae8d3bc7ad3;hb=53735a9d964579829d089f4b7572aef50c4e1468;hpb=8ac096b5bf9da1b3961a3ac4a03d083629222a63

diff --git a/src/tincctl.c b/src/tincctl.c
index 63b75895..f3a73b77 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -25,6 +25,7 @@
 #include "protocol.h"
 #include "control_common.h"
 #include "ecdsagen.h"
+#include "info.h"
 #include "rsagen.h"
 #include "utils.h"
 #include "tincctl.h"
@@ -45,6 +46,16 @@ static char *pidfilename = NULL;			/* pid file location */
 static char controlcookie[1024];
 char *netname = NULL;
 char *confbase = NULL;
+static char *tinc_conf = NULL;
+static char *hosts_dir = NULL;
+
+// Horrible global variables...
+static int pid = 0;
+static int fd = -1;
+static char line[4096];
+static int code;
+static int req;
+static int result;
 
 #ifdef HAVE_MINGW
 static struct WSAData wsa_state;
@@ -52,13 +63,31 @@ 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},
 	{NULL, 0, NULL, 0}
 };
 
+static void version(void) {
+	printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
+		   VERSION, __DATE__, __TIME__, PROT_MAJOR, PROT_MINOR);
+	printf("Copyright (C) 1998-2012 Ivo Timmermans, Guus Sliepen and others.\n"
+			"See the AUTHORS file for a complete list.\n\n"
+			"tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
+			"and you are welcome to redistribute it under certain conditions;\n"
+			"see the file COPYING for details.\n");
+}
+
 static void usage(bool status) {
 	if(status)
 		fprintf(stderr, "Try `%s --help\' for more information.\n",
@@ -73,7 +102,12 @@ static void usage(bool status) {
 				"      --version           Output version information and exit.\n"
 				"\n"
 				"Valid commands are:\n"
-				"  start                      Start tincd.\n"
+				"  init [name]                Create initial configuration files.\n"
+				"  config                     Change configuration:\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"
 				"  reload                     Partially reload configuration of running tincd.\n"
@@ -87,6 +121,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"
@@ -105,7 +140,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;
@@ -344,9 +379,9 @@ static void make_names(void) {
 		if(!pidfilename)
 			xasprintf(&pidfilename, "%s/pid", confbase);
 		RegCloseKey(key);
-		if(*installdir)
-			return;
 	}
+
+	if(!*installdir) {
 #endif
 
 	if(!pidfilename)
@@ -361,6 +396,13 @@ static void make_names(void) {
 		if(!confbase)
 			xasprintf(&confbase, CONFDIR "/tinc");
 	}
+
+#ifdef HAVE_MINGW
+	}
+#endif
+
+	xasprintf(&tinc_conf, "%s/tinc.conf", confbase);
+	xasprintf(&hosts_dir, "%s/hosts", confbase);
 }
 
 static char buffer[4096];
@@ -541,102 +583,28 @@ static bool remove_service(void) {
 }
 #endif
 
-int main(int argc, char *argv[]) {
-	int fd;
-	int result;
-	char host[128];
-	char port[128];
-	int pid;
-
-	program_name = argv[0];
-
-	if(!parse_options(argc, argv))
-		return 1;
-	
-	make_names();
-
-	if(show_version) {
-		printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
-			   VERSION, __DATE__, __TIME__, PROT_MAJOR, PROT_MINOR);
-		printf("Copyright (C) 1998-2012 Ivo Timmermans, Guus Sliepen and others.\n"
-				"See the AUTHORS file for a complete list.\n\n"
-				"tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
-				"and you are welcome to redistribute it under certain conditions;\n"
-				"see the file COPYING for details.\n");
-
-		return 0;
-	}
-
-	if(show_help) {
-		usage(false);
-		return 0;
-	}
-
-	if(optind >= argc) {
-		fprintf(stderr, "Not enough arguments.\n");
-		usage(true);
-		return 1;
-	}
-
-	// First handle commands that don't involve connecting to a running tinc daemon.
-
-	if(!strcasecmp(argv[optind], "generate-rsa-keys")) {
-		return !rsa_keygen(optind < argc - 1 ? atoi(argv[optind + 1]) : 2048);
-	}
-
-	if(!strcasecmp(argv[optind], "generate-ecdsa-keys")) {
-		return !ecdsa_keygen();
-	}
-
-	if(!strcasecmp(argv[optind], "generate-keys")) {
-		return !(rsa_keygen(optind < argc - 1 ? atoi(argv[optind + 1]) : 2048) && ecdsa_keygen());
-	}
-
-	if(!strcasecmp(argv[optind], "start")) {
-		int i, j;
-		char *c;
-		char *slash = strrchr(argv[0], '/');
-#ifdef HAVE_MINGW
-		if ((c = strrchr(argv[0], '\\')) > slash)
-			slash = c;
-#endif
-		if (slash++) {
-			c = xmalloc((slash - argv[0]) + sizeof("tincd"));
-			sprintf(c, "%.*stincd", (int)(slash - argv[0]), argv[0]);
-		}
-		else
-			c = "tincd";
-		argv[0] = c;
-		for(i = j = 1; argv[i]; ++i)
-			if (i != optind && strcmp(argv[i], "--") != 0)
-				argv[j++] = argv[i];
-		argv[j] = NULL;
-		execvp(c, argv);
-		fprintf(stderr, "Could not start %s: %s\n", c, strerror(errno));
-		return 1;
-	}
-
-	/*
-	 * Now handle commands that do involve connecting to a running tinc daemon.
-	 * Authenticate the server by ensuring the parent directory can be
-	 * traversed only by root. Note this is not totally race-free unless all
-	 * ancestors are writable only by trusted users, which we don't verify.
-	 */
+static bool connect_tincd() {
+	if(fd >= 0)
+		return true;
 
 	FILE *f = fopen(pidfilename, "r");
 	if(!f) {
 		fprintf(stderr, "Could not open pid file %s: %s\n", pidfilename, strerror(errno));
-		return 1;
+		return false;
 	}
+
+	char host[128];
+	char port[128];
+
 	if(fscanf(f, "%20d %1024s %128s port %128s", &pid, controlcookie, host, port) != 4) {
 		fprintf(stderr, "Could not parse pid file %s\n", pidfilename);
-		return 1;
+		return false;
 	}
 
 #ifdef HAVE_MINGW
 	if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
 		fprintf(stderr, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
-		return 1;
+		return false;
 	}
 #endif
 
@@ -651,13 +619,13 @@ int main(int argc, char *argv[]) {
 
 	if(getaddrinfo(host, port, &hints, &res) || !res) {
 		fprintf(stderr, "Cannot resolve %s port %s: %s", host, port, strerror(errno));
-		return 1;
+		return false;
 	}
 
 	fd = socket(res->ai_family, SOCK_STREAM, IPPROTO_TCP);
 	if(fd < 0) {
 		fprintf(stderr, "Cannot create TCP socket: %s\n", sockstrerror(sockerrno));
-		return 1;
+		return false;
 	}
 
 #ifdef HAVE_MINGW
@@ -670,210 +638,791 @@ int main(int argc, char *argv[]) {
 
 	if(connect(fd, res->ai_addr, res->ai_addrlen) < 0) {
 		fprintf(stderr, "Cannot connect to %s port %s: %s\n", host, port, sockstrerror(sockerrno));
-		return 1;
+		return false;
 	}
 
 	freeaddrinfo(res);
 
-	char line[4096];
 	char data[4096];
-	int code, version, req;
+	int version;
 
 	if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %s %d", &code, data, &version) != 3 || code != 0) {
-		fprintf(stderr, "Cannot read greeting from control socket: %s\n",
-				sockstrerror(sockerrno));
-		return 1;
+		fprintf(stderr, "Cannot read greeting from control socket: %s\n", sockstrerror(sockerrno));
+		return false;
 	}
 
 	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) {
 		fprintf(stderr, "Could not fully establish control socket connection\n");
-		return 1;
+		return false;
 	}
 
-	if(!strcasecmp(argv[optind], "pid")) {
-		printf("%d\n", pid);
-		return 0;
+	return true;
+}
+
+
+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
+	if ((c = strrchr(argv[0], '\\')) > slash)
+		slash = c;
+#endif
+
+	if (slash++) {
+		c = xmalloc((slash - argv[0]) + sizeof("tincd"));
+		sprintf(c, "%.*stincd", (int)(slash - argv[0]), argv[0]);
 	}
+	else
+		c = "tincd";
+
+	argv[0] = c;
+
+	for(i = j = 1; argv[i]; ++i)
+		if (i != optind && strcmp(argv[i], "--") != 0)
+			argv[j++] = argv[i];
 
-	if(!strcasecmp(argv[optind], "stop")) {
+	argv[j] = NULL;
+	execvp(c, argv);
+	fprintf(stderr, "Could not start %s: %s\n", c, strerror(errno));
+	return 1;
+}
+
+static int cmd_stop(int argc, char *argv[]) {
 #ifndef HAVE_MINGW
-		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;
-		}
+	if(!connect_tincd())
+		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) {
+		fprintf(stderr, "Could not stop tinc daemon.\n");
+		return 1;
+	}
 #else
-		if(!remove_service())
-			return 1;
+	if(!remove_service())
+		return 1;
 #endif
-		return 0;
+	return 0;
+}
+
+static int cmd_restart(int argc, char *argv[]) {
+	return cmd_stop(argc, argv) ?: cmd_start(argc, argv);
+}
+
+static int cmd_reload(int argc, char *argv[]) {
+	if(!connect_tincd())
+		return 1;
+
+	sendline(fd, "%d %d", CONTROL, REQ_RELOAD);
+	if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_RELOAD || result) {
+		fprintf(stderr, "Could not reload configuration.\n");
+		return 1;
 	}
 
-	if(!strcasecmp(argv[optind], "reload")) {
-		sendline(fd, "%d %d", CONTROL, REQ_RELOAD);
-		if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_RELOAD || result) {
-			fprintf(stderr, "Could not reload tinc daemon\n");
-			return 1;
+	return 0;
+
+}
+
+static int cmd_dump(int argc, char *argv[]) {
+	if(argc != 2) {
+		fprintf(stderr, "Invalid number of arguments.\n");
+		usage(true);
+		return 1;
+	}
+
+	if(!connect_tincd())
+		return 1;
+
+	bool do_graph = false;
+
+	if(!strcasecmp(argv[1], "nodes"))
+		sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
+	else if(!strcasecmp(argv[1], "edges"))
+		sendline(fd, "%d %d", CONTROL, REQ_DUMP_EDGES);
+	else if(!strcasecmp(argv[1], "subnets"))
+		sendline(fd, "%d %d", CONTROL, REQ_DUMP_SUBNETS);
+	else if(!strcasecmp(argv[1], "connections"))
+		sendline(fd, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
+	else if(!strcasecmp(argv[1], "graph")) {
+		sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
+		sendline(fd, "%d %d", CONTROL, REQ_DUMP_EDGES);
+		do_graph = true;
+	} else {
+		fprintf(stderr, "Unknown dump type '%s'.\n", argv[1]);
+		usage(true);
+		return 1;
+	}
+
+	if(do_graph)
+		printf("digraph {\n");
+
+	while(recvline(fd, line, sizeof line)) {
+		char node1[4096], node2[4096];
+		int n = sscanf(line, "%d %d %s to %s", &code, &req, node1, node2);
+		if(n == 2) {
+			if(do_graph && req == REQ_DUMP_NODES)
+				continue;
+			else {
+				if(do_graph)
+					printf("}\n");
+				return 0;
+			}
+		}
+		if(n < 2)
+			break;
+
+		if(!do_graph)
+			printf("%s\n", line + 5);
+		else {
+			if(req == REQ_DUMP_NODES)
+				printf(" %s [label = \"%s\"];\n", node1, node1);
+			else
+				printf(" %s -> %s;\n", node1, node2);
 		}
-		return 0;
 	}
 
-	if(!strcasecmp(argv[optind], "restart")) {
-		sendline(fd, "%d %d", CONTROL, REQ_RESTART);
-		if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_RESTART || result) {
-			fprintf(stderr, "Could not restart tinc daemon\n");
-			return 1;
+	fprintf(stderr, "Error receiving dump.\n");
+	return 1;
+}
+
+static int cmd_purge(int argc, char *argv[]) {
+	if(!connect_tincd())
+		return 1;
+
+	sendline(fd, "%d %d", CONTROL, REQ_PURGE);
+	if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_PURGE || result) {
+		fprintf(stderr, "Could not purge old information.\n");
+		return 1;
+	}
+
+	return 0;
+}
+
+static int cmd_debug(int argc, char *argv[]) {
+	if(argc != 2) {
+		fprintf(stderr, "Invalid number of arguments.\n");
+		return 1;
+	}
+
+	if(!connect_tincd())
+		return 1;
+
+	int debuglevel = atoi(argv[1]);
+	int origlevel;
+
+	sendline(fd, "%d %d %d", CONTROL, REQ_SET_DEBUG, debuglevel);
+	if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &origlevel) != 3 || code != CONTROL || req != REQ_SET_DEBUG) {
+		fprintf(stderr, "Could not set debug level.\n");
+		return 1;
+	}
+
+	fprintf(stderr, "Old level %d, new level %d.\n", origlevel, debuglevel);
+	return 0;
+}
+
+static int cmd_retry(int argc, char *argv[]) {
+	if(!connect_tincd())
+		return 1;
+
+	sendline(fd, "%d %d", CONTROL, REQ_RETRY);
+	if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_RETRY || result) {
+		fprintf(stderr, "Could not retry outgoing connections.\n");
+		return 1;
+	}
+
+	return 0;
+}
+
+static int cmd_connect(int argc, char *argv[]) {
+	if(argc != 2) {
+		fprintf(stderr, "Invalid number of arguments.\n");
+		return 1;
+	}
+
+	if(!check_id(argv[2])) {
+		fprintf(stderr, "Invalid name for node.\n");
+		return 1;
+	}
+
+	if(!connect_tincd())
+		return 1;
+
+	sendline(fd, "%d %d %s", CONTROL, REQ_CONNECT, argv[1]);
+	if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_CONNECT || result) {
+		fprintf(stderr, "Could not connect to %s.\n", argv[1]);
+		return 1;
+	}
+
+	return 0;
+}
+
+static int cmd_disconnect(int argc, char *argv[]) {
+	if(argc != 2) {
+		fprintf(stderr, "Invalid number of arguments.\n");
+		return 1;
+	}
+
+	if(!check_id(argv[2])) {
+		fprintf(stderr, "Invalid name for node.\n");
+		return 1;
+	}
+
+	if(!connect_tincd())
+		return 1;
+
+	sendline(fd, "%d %d %s", CONTROL, REQ_DISCONNECT, argv[1]);
+	if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_DISCONNECT || result) {
+		fprintf(stderr, "Could not disconnect %s.\n", argv[1]);
+		return 1;
+	}
+
+	return 0;
+}
+
+static int cmd_top(int argc, char *argv[]) {
+#ifdef HAVE_CURSES
+	if(!connect_tincd())
+		return 1;
+
+	top(fd);
+	return 0;
+#else
+	fprintf(stderr, "This version of tincctl was compiled without support for the curses library.\n");
+	return 1;
+#endif
+}
+
+static int cmd_pcap(int argc, char *argv[]) {
+	if(!connect_tincd())
+		return 1;
+
+	pcap(fd, stdout, argc > 1 ? atoi(argv[1]) : 0);
+	return 0;
+}
+
+static int cmd_log(int argc, char *argv[]) {
+	if(!connect_tincd())
+		return 1;
+
+	logcontrol(fd, stdout, argc > 1 ? atoi(argv[1]) : -1);
+	return 0;
+}
+
+static int cmd_pid(int argc, char *argv[]) {
+	if(!connect_tincd())
+		return 1;
+
+	printf("%d\n", pid);
+	return 0;
+}
+
+static 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() {
+	FILE *f = fopen(tinc_conf, "r");
+	if(!f) {
+		fprintf(stderr, "Could not open %s: %s\n", tinc_conf, strerror(errno));
+		return NULL;
+	}
+
+	char buf[4096];
+	char *value;
+	while(fgets(buf, sizeof buf, f)) {
+		int len = strcspn(buf, "\t =");
+		value = buf + len;
+		value += strspn(value, "\t ");
+		if(*value == '=') {
+			value++;
+			value += strspn(value, "\t ");
+		}
+		if(!rstrip(value))
+			continue;
+		buf[len] = 0;
+		if(strcasecmp(buf, "Name"))
+			continue;
+		if(*value) {
+			fclose(f);
+			return strdup(value);
 		}
-		return 0;
 	}
 
-	if(!strcasecmp(argv[optind], "retry")) {
-		sendline(fd, "%d %d", CONTROL, REQ_RETRY);
-		if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_RETRY || result) {
-			fprintf(stderr, "Could not retry outgoing connections\n");
-			return 1;
+	fclose(f);
+	fprintf(stderr, "Could not find Name in %s.\n", tinc_conf);
+	return NULL;
+}
+
+static char *hostvariables[] = {
+	"Address",
+	"Port",
+	"PublicKey",
+	"Subnet",
+	NULL,
+};
+
+static int cmd_config(int argc, char *argv[]) {
+	if(argc < 2) {
+		fprintf(stderr, "Invalid number of arguments.\n");
+		return 1;
+	}
+
+	int action = 0;
+	if(!strcasecmp(argv[1], "add")) {
+		argv++, argc--, action = 1;
+	} else if(!strcasecmp(argv[1], "del")) {
+		argv++, argc--, action = -1;
+	} else if(!strcasecmp(argv[1], "replace") || !strcasecmp(argv[1], "set") || !strcasecmp(argv[1], "change")) {
+		argv++, argc--, action = 0;
+	}
+
+	if(argc < 2) {
+		fprintf(stderr, "Invalid number of arguments.\n");
+		return 1;
+	}
+
+	// Concatenate the rest of the command line
+	strncpy(line, argv[1], sizeof line - 1);
+	for(int i = 2; i < argc; i++) {
+		strncat(line, " ", sizeof line - 1 - strlen(line));
+		strncat(line, argv[i], sizeof line - 1 - strlen(line));
+	}
+
+	// Liberal parsing into node name, variable name and value.
+	char *node = NULL;
+	char *variable;
+	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';
+	variable = strchr(line, '.');
+	if(variable) {
+		node = line;
+		*variable++ = 0;
+	} else {
+		variable = line;
+	}
+
+	if(!*variable) {
+		fprintf(stderr, "No variable given.\n");
+		return 1;
+	}
+
+	if(action >= 0 && !*value) {
+		fprintf(stderr, "No value for variable given.\n");
+		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;
+			}
 		}
-		return 0;
 	}
 
-	if(!strcasecmp(argv[optind], "dump")) {
-		if(argc < optind + 2) {
-			fprintf(stderr, "Not enough arguments.\n");
-			usage(true);
+	if(node && !check_id(node)) {
+		fprintf(stderr, "Invalid name for node.\n");
+		return 1;
+	}
+
+	// Open the right configuration file.
+	char *filename;
+	if(node)
+		xasprintf(&filename, "%s/%s", hosts_dir, node);
+	else
+		filename = tinc_conf;
+
+	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;
 		}
 
-		bool do_graph = false;
-
-		if(!strcasecmp(argv[optind+1], "nodes"))
-			sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
-		else if(!strcasecmp(argv[optind+1], "edges"))
-			sendline(fd, "%d %d", CONTROL, REQ_DUMP_EDGES);
-		else if(!strcasecmp(argv[optind+1], "subnets"))
-			sendline(fd, "%d %d", CONTROL, REQ_DUMP_SUBNETS);
-		else if(!strcasecmp(argv[optind+1], "connections"))
-			sendline(fd, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
-		else if(!strcasecmp(argv[optind+1], "graph")) {
-			sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
-			sendline(fd, "%d %d", CONTROL, REQ_DUMP_EDGES);
-			do_graph = true;
-			printf("digraph {\n");
-		} else {
-			fprintf(stderr, "Unknown dump type '%s'.\n", argv[optind+1]);
-			usage(true);
+		// 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);
 		}
+	}
 
-		while(recvline(fd, line, sizeof line)) {
-			char node1[4096], node2[4096];
-			int n = sscanf(line, "%d %d %s to %s", &code, &req, node1, node2);
-			if(n == 2) {
-				if(do_graph && req == REQ_DUMP_NODES)
+	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;
+	}
+
+	// Copy the file, making modifications on the fly.
+	char buf1[4096];
+	char buf2[4096];
+	bool set = false;
+	bool removed = false;
+
+	while(fgets(buf1, sizeof buf1, f)) {
+		buf1[sizeof buf1 - 1] = 0;
+		strcpy(buf2, buf1);
+
+		// Parse line in a simple way
+		char *bvalue;
+		int len;
+
+		len = strcspn(buf2, "\t =");
+		bvalue = buf2 + len;
+		bvalue += strspn(bvalue, "\t ");
+		if(*bvalue == '=') {
+			bvalue++;
+			bvalue += strspn(bvalue, "\t ");
+		}
+		rstrip(bvalue);
+		buf2[len] = '\0';
+
+		// Did it match?
+		if(!strcasecmp(buf2, variable)) {
+			// Del
+			if(action < 0) {
+				if(!*value || !strcasecmp(bvalue, value)) {
+					removed = true;
+					continue;
+				}
+			// Set
+			} else if(action == 0) {
+				// Already set? Delete the rest...
+				if(set)
 					continue;
-				else {
-					if(do_graph)
-						printf("}\n");
-					return 0;
+				// Otherwise, replace.
+				if(fprintf(tf, "%s = %s\n", variable, value) < 0) {
+					fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
+					return 1;
 				}
+				set = true;
+				continue;
 			}
-			if(n < 2)
-				break;
+		}
 
-			if(!do_graph)
-				printf("%s\n", line + 5);
-			else {
-				if(req == REQ_DUMP_NODES)
-					printf(" %s [label = \"%s\"];\n", node1, node1);
-				else
-					printf(" %s -> %s;\n", node1, node2);
-			}
+		// Copy original line...
+		if(fputs(buf1, tf) < 0) {
+			fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
+			return 1;
 		}
+	}
+
+	// Make sure we read everything...
+	if(ferror(f) || !feof(f)) {
+		fprintf(stderr, "Error while reading from configuration file %s: %s\n", filename, strerror(errno));
+		return 1;
+	}
 
-		fprintf(stderr, "Error receiving dump\n");
+	if(fclose(f)) {
+		fprintf(stderr, "Error closing configuration file %s: %s\n", filename, strerror(errno));
 		return 1;
 	}
 
-	if(!strcasecmp(argv[optind], "purge")) {
-		sendline(fd, "%d %d", CONTROL, REQ_PURGE);
-		if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_PURGE || result) {
-			fprintf(stderr, "Could not purge tinc daemon\n");
+	// Add new variable if necessary.
+	if(action > 0 || (action == 0 && !set)) {
+		if(fprintf(tf, "%s = %s\n", variable, value) < 0) {
+			fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
 			return 1;
 		}
-		return 0;
 	}
 
-	if(!strcasecmp(argv[optind], "debug")) {
-		int debuglevel, origlevel;
+	// Make sure we wrote everything...
+	if(fclose(tf)) {
+		fprintf(stderr, "Error closing temporary file %s: %s\n", tmpfile, strerror(errno));
+		return 1;
+	}
+
+	// Could we find what we had to remove?
+	if(action < 0 && !removed) {
+		remove(tmpfile);
+		fprintf(stderr, "No configuration variables deleted.\n");
+		return *value;
+	}
 
-		if(argc != optind + 2) {
-			fprintf(stderr, "Invalid arguments.\n");
-			return 1;
-		}
-		debuglevel = atoi(argv[optind+1]);
+	// Replace the configuration file with the new one
+#ifdef HAVE_MINGW
+	if(remove(filename)) {
+		fprintf(stderr, "Error replacing file %s: %s\n", filename, strerror(errno));
+		return 1;
+	}
+#endif
+	if(rename(tmpfile, filename)) {
+		fprintf(stderr, "Error renaming temporary file %s to configuration file %s: %s\n", tmpfile, filename, strerror(errno));
+		return 1;
+	}
 
-		sendline(fd, "%d %d %d", CONTROL, REQ_SET_DEBUG, debuglevel);
-		if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &origlevel) != 3 || code != CONTROL || req != REQ_SET_DEBUG) {
-			fprintf(stderr, "Could not purge tinc daemon\n");
-			return 1;
-		}
+	// Silently try notifying a running tincd of changes.
+	fclose(stderr);
 
-		fprintf(stderr, "Old level %d, new level %d\n", origlevel, debuglevel);
-		return 0;
+	if(connect_tincd())
+		sendline(fd, "%d %d", CONTROL, REQ_RELOAD);
+
+	return 0;
+}
+
+bool check_id(const char *name) {
+	for(int i = 0; i < strlen(name); i++) {
+		if(!isalnum(name[i]) && name[i] != '_')
+			return false;
 	}
 
-	if(!strcasecmp(argv[optind], "connect")) {
-		if(argc != optind + 2) {
-			fprintf(stderr, "Invalid arguments.\n");
+	return true;
+}
+
+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(isatty(0) && isatty(1)) {
+			char buf[1024];
+			fprintf(stdout, "Enter the Name you want your tinc node to have: ");
+			fflush(stdout);
+			if(!fgets(buf, sizeof buf, stdin)) {
+				fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
+				return 1;
+			}
+			int len = rstrip(buf);
+			if(!len) {
+				fprintf(stderr, "No name given!\n");
+				return 1;
+			}
+			name = strdup(buf);
+		} else {
+			fprintf(stderr, "No Name given!\n");
 			return 1;
 		}
-		char *name = argv[optind + 1];
-
-		sendline(fd, "%d %d %s", CONTROL, REQ_CONNECT, name);
-		if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_CONNECT || result) {
-			fprintf(stderr, "Could not connect to %s\n", name);
+	} else {
+		name = strdup(argv[1]);
+		if(!*name) {
+			fprintf(stderr, "No Name given!\n");
 			return 1;
 		}
-		return 0;
 	}
 
-	if(!strcasecmp(argv[optind], "disconnect")) {
-		if(argc != optind + 2) {
-			fprintf(stderr, "Invalid arguments.\n");
-			return 1;
-		}
-		char *name = argv[optind + 1];
+	if(!check_id(name)) {
+		fprintf(stderr, "Invalid Name! Only a-z, A-Z, 0-9 and _ are allowed characters.\n");
+		return 1;
+	}
 
-		sendline(fd, "%d %d %s", CONTROL, REQ_DISCONNECT, name);
-		if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_DISCONNECT || result) {
-			fprintf(stderr, "Could not disconnect %s\n", name);
-			return 1;
+	if(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) {
+		fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
+		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;
+	}
+
+	FILE *f = fopen(tinc_conf, "w");
+	if(!f) {
+		fprintf(stderr, "Could not create file %s: %s\n", tinc_conf, strerror(errno));
+		return 1;
+	}
+
+	fprintf(f, "Name = %s\n", name);
+	fclose(f);
+
+	fclose(stdin);
+	if(!rsa_keygen(2048) || !ecdsa_keygen())
+		return false;
+
+	return true;
+
+}
+
+static int cmd_generate_keys(int argc, char *argv[]) {
+	return !(rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048) && ecdsa_keygen());
+}
+
+static int cmd_generate_rsa_keys(int argc, char *argv[]) {
+	return !rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048);
+}
+
+static int cmd_generate_ecdsa_keys(int argc, char *argv[]) {
+	return !ecdsa_keygen();
+}
+
+static int cmd_help(int argc, char *argv[]) {
+	usage(false);
+	return 0;
+}
+
+static int cmd_version(int argc, char *argv[]) {
+	version();
+	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",
+	"tinc-down",
+	"subnet-up",
+	"subnet-down",
+	"host-up",
+	"host-down",
+	NULL,
+};
+
+static int cmd_edit(int argc, char *argv[]) {
+	if(argc != 2) {
+		fprintf(stderr, "Invalid number of arguments.\n");
+		return 1;
+	}
+
+	char *filename = NULL;
+
+	if(strncmp(argv[1], "hosts/", 6)) {
+		for(int i = 0; conffiles[i]; i++) {
+			if(!strcmp(argv[1], conffiles[i])) {
+				xasprintf(&filename, "%s/%s", confbase, argv[1]);
+				break;
+			}
 		}
-		return 0;
+	} else {
+		argv[1] += 6;
 	}
 
-#ifdef HAVE_CURSES
-	if(!strcasecmp(argv[optind], "top")) {
-		top(fd);
-		return 0;
+	if(!filename) {
+		xasprintf(&filename, "%s/%s", hosts_dir, argv[1]);
+		char *dash = strchr(argv[1], '-');
+		if(dash) {
+			*dash++ = 0;
+			if((strcmp(dash, "up") && strcmp(dash, "down")) || !check_id(argv[1])) {
+				fprintf(stderr, "Invalid configuration filename.\n");
+				return 1;
+			}
+		}
 	}
+
+#ifndef HAVE_MINGW
+	char *editor = getenv("VISUAL") ?: getenv("EDITOR") ?: "vi";
+#else
+	char *editor = "edit"
 #endif
 
-	if(!strcasecmp(argv[optind], "pcap")) {
-		pcap(fd, stdout, optind < argc - 1 ? atoi(argv[optind + 1]) : 0);
+	char *command;
+	xasprintf(&command, "\"%s\" \"%s\"", editor, filename);
+	int result = system(command);
+	if(result)
+		return result;
+
+	// Silently try notifying a running tincd of changes.
+	fclose(stderr);
+
+	if(connect_tincd())
+		sendline(fd, "%d %d", CONTROL, REQ_RELOAD);
+
+	return 0;
+}
+
+static const struct {
+	const char *command;
+	int (*function)(int argc, char *argv[]);
+} commands[] = {
+	{"start", cmd_start},
+	{"stop", cmd_stop},
+	{"restart", cmd_restart},
+	{"reload", cmd_reload},
+	{"dump", cmd_dump},
+	{"purge", cmd_purge},
+	{"debug", cmd_debug},
+	{"retry", cmd_retry},
+	{"connect", cmd_connect},
+	{"disconnect", cmd_disconnect},
+	{"top", cmd_top},
+	{"pcap", cmd_pcap},
+	{"log", cmd_log},
+	{"pid", cmd_pid},
+	{"config", cmd_config},
+	{"init", cmd_init},
+	{"generate-keys", cmd_generate_keys},
+	{"generate-rsa-keys", cmd_generate_rsa_keys},
+	{"generate-ecdsa-keys", cmd_generate_ecdsa_keys},
+	{"help", cmd_help},
+	{"version", cmd_version},
+	{"info", cmd_info},
+	{"edit", cmd_edit},
+	{NULL, NULL},
+};
+
+int main(int argc, char *argv[]) {
+	program_name = argv[0];
+
+	if(!parse_options(argc, argv))
+		return 1;
+	
+	make_names();
+
+	if(show_version) {
+		version();
 		return 0;
 	}
 
-	if(!strcasecmp(argv[optind], "log")) {
-		logcontrol(fd, stdout, optind < argc - 1 ? atoi(argv[optind + 1]) : -1);
+	if(show_help) {
+		usage(false);
 		return 0;
 	}
 
+	if(optind >= argc) {
+		fprintf(stderr, "No command given.\n");
+		usage(true);
+		return 1;
+	}
+
+	for(int i = 0; commands[i].command; i++) {
+		if(!strcasecmp(argv[optind], commands[i].command))
+			return commands[i].function(argc - optind, argv + optind);
+	}
+
 	fprintf(stderr, "Unknown command `%s'.\n", argv[optind]);
 	usage(true);
-	
-	close(fd);
-
-	return 0;
+	return 1;
 }