X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Ftincctl.c;h=489d10cd0e32dab518dc4085ab19c0a97d983701;hb=97355690b9cf8d8b56a316e01f73f8ff1fee68c8;hp=bff122b0efc5518f0403272a9226f153b73bceb3;hpb=a62a6825a8a69e279ee0688a4cd9e51fbc52054b;p=meshlink

diff --git a/src/tincctl.c b/src/tincctl.c
index bff122b0..489d10cd 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1,6 +1,6 @@
 /*
     tincctl.c -- Controlling a running tincd
-    Copyright (C) 2007 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2011 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
@@ -12,27 +12,22 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
-#include <sys/un.h>
-#include <openssl/rand.h>
-#include <openssl/rsa.h>
-#include <openssl/pem.h>
-#include <openssl/evp.h>
-#include <openssl/engine.h>
-
 #include <getopt.h>
 
 #include "xalloc.h"
 #include "protocol.h"
 #include "control_common.h"
+#include "rsagen.h"
+#include "utils.h"
+#include "tincctl.h"
+#include "top.h"
 
 /* The name this program was run with. */
 char *program_name = NULL;
@@ -49,30 +44,36 @@ int kill_tincd = 0;
 /* If nonzero, generate public/private keypair for this host/net. */
 int generate_keys = 0;
 
+static char *name = NULL;
 static char *identname = NULL;				/* program name for syslog */
-static char *controlsocketname = NULL;			/* pid file location */
+static char *controlcookiename = NULL;			/* cookie file location */
+static char controlcookie[1024];
 char *netname = NULL;
 char *confbase = NULL;
 
+#ifdef HAVE_MINGW
+static struct WSAData wsa_state;
+#endif
+
 static struct option const long_options[] = {
 	{"config", required_argument, NULL, 'c'},
 	{"net", required_argument, NULL, 'n'},
 	{"help", no_argument, NULL, 1},
 	{"version", no_argument, NULL, 2},
-	{"controlsocket", required_argument, NULL, 5},
+	{"controlcookie", required_argument, NULL, 5},
 	{NULL, 0, NULL, 0}
 };
 
 static void usage(bool status) {
 	if(status)
-		fprintf(stderr, _("Try `%s --help\' for more information.\n"),
+		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"
+		printf("Usage: %s [options] command\n\n", program_name);
+		printf("Valid options are:\n"
 				"  -c, --config=DIR              Read configuration options from DIR.\n"
 				"  -n, --net=NETNAME             Connect to net NETNAME.\n"
-				"      --controlsocket=FILENAME  Open control socket at FILENAME.\n"
+				"      --controlcookie=FILENAME  Read control socket from FILENAME.\n"
 				"      --help                    Display this help and exit.\n"
 				"      --version                 Output version information and exit.\n"
 				"\n"
@@ -91,8 +92,14 @@ static void usage(bool status) {
 				"    graph                    - graph of the VPN in dotty format\n"
 				"  purge                      Purge unreachable nodes\n"
 				"  debug N                    Set debug level\n"
-				"\n"));
-		printf(_("Report bugs to tinc@tinc-vpn.org.\n"));
+				"  retry                      Retry all outgoing connections\n"
+				"  reload                     Partial reload of configuration\n"
+				"  disconnect NODE            Close meta connection with NODE\n"
+#ifdef HAVE_CURSES
+				"  top                        Show real-time statistics\n"
+#endif
+				"\n");
+		printf("Report bugs to tinc@tinc-vpn.org.\n");
 	}
 }
 
@@ -122,7 +129,7 @@ static bool parse_options(int argc, char **argv) {
 				break;
 
 			case 5:					/* open control socket here */
-				controlsocketname = xstrdup(optarg);
+				controlcookiename = xstrdup(optarg);
 				break;
 
 			case '?':
@@ -147,12 +154,12 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
 	/* Check stdin and stdout */
 	if(isatty(0) && isatty(1)) {
 		/* Ask for a file and/or directory name. */
-		fprintf(stdout, _("Please enter a file to save %s to [%s]: "),
+		fprintf(stdout, "Please enter a file to save %s to [%s]: ",
 				what, filename);
 		fflush(stdout);
 
 		if(fgets(buf, sizeof buf, stdin) < 0) {
-			fprintf(stderr, _("Error while reading stdin: %s\n"),
+			fprintf(stderr, "Error while reading stdin: %s\n",
 					strerror(errno));
 			return NULL;
 		}
@@ -183,70 +190,32 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
 	r = fopen(filename, mode);
 
 	if(!r) {
-		fprintf(stderr, _("Error opening file `%s': %s\n"), filename, strerror(errno));
+		fprintf(stderr, "Error opening file `%s': %s\n", filename, strerror(errno));
 		return NULL;
 	}
 
 	return r;
 }
 
-/* This function prettyprints the key generation process */
-
-static void indicator(int a, int b, void *p) {
-	switch (a) {
-		case 0:
-			fprintf(stderr, ".");
-			break;
-
-		case 1:
-			fprintf(stderr, "+");
-			break;
-
-		case 2:
-			fprintf(stderr, "-");
-			break;
-
-		case 3:
-			switch (b) {
-				case 0:
-					fprintf(stderr, " p\n");
-					break;
-
-				case 1:
-					fprintf(stderr, " q\n");
-					break;
-
-				default:
-					fprintf(stderr, "?");
-			}
-			break;
-
-		default:
-			fprintf(stderr, "?");
-	}
-}
-
 /*
   Generate a public/private RSA keypair, and ask for a file to store
   them in.
 */
 static bool keygen(int bits) {
-	RSA *rsa_key;
+	rsa_t key;
 	FILE *f;
-	char *name = NULL;
 	char *filename;
 
-	fprintf(stderr, _("Generating %d bits keys:\n"), bits);
-	rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL);
+	fprintf(stderr, "Generating %d bits keys:\n", bits);
 
-	if(!rsa_key) {
-		fprintf(stderr, _("Error during key generation!\n"));
+	if(!rsa_generate(&key, bits, 0x10001)) {
+		fprintf(stderr, "Error during key generation!\n");
 		return false;
 	} else
-		fprintf(stderr, _("Done.\n"));
+		fprintf(stderr, "Done.\n");
 
-	asprintf(&filename, "%s/rsa_key.priv", confbase);
-	f = ask_and_open(filename, _("private RSA key"), "a");
+	xasprintf(&filename, "%s/rsa_key.priv", confbase);
+	f = ask_and_open(filename, "private RSA key", "a");
 
 	if(!f)
 		return false;
@@ -257,26 +226,28 @@ static bool keygen(int bits) {
 #endif
 		
 	if(ftell(f))
-		fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
+		fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n");
+
+	rsa_write_pem_private_key(&key, f);
 
-	PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
 	fclose(f);
 	free(filename);
 
 	if(name)
-		asprintf(&filename, "%s/hosts/%s", confbase, name);
+		xasprintf(&filename, "%s/hosts/%s", confbase, name);
 	else
-		asprintf(&filename, "%s/rsa_key.pub", confbase);
+		xasprintf(&filename, "%s/rsa_key.pub", confbase);
 
-	f = ask_and_open(filename, _("public RSA key"), "a");
+	f = ask_and_open(filename, "public RSA key", "a");
 
 	if(!f)
 		return false;
 
 	if(ftell(f))
-		fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
+		fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n");
+
+	rsa_write_pem_public_key(&key, f);
 
-	PEM_write_RSAPublicKey(f, rsa_key);
 	fclose(f);
 	free(filename);
 
@@ -290,177 +261,123 @@ static void make_names(void) {
 #ifdef HAVE_MINGW
 	HKEY key;
 	char installdir[1024] = "";
-	long len = sizeof(installdir);
+	long len = sizeof installdir;
 #endif
 
 	if(netname)
-		asprintf(&identname, "tinc.%s", 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(!logfilename)
-				asprintf(&logfilename, "%s/log/%s.log", identname);
 			if(!confbase) {
 				if(netname)
-					asprintf(&confbase, "%s/%s", installdir, netname);
+					xasprintf(&confbase, "%s/%s", installdir, netname);
 				else
-					asprintf(&confbase, "%s", installdir);
+					xasprintf(&confbase, "%s", installdir);
 			}
 		}
+		if(!controlcookiename)
+			xasprintf(&controlcookiename, "%s/cookie", confbase);
 		RegCloseKey(key);
 		if(*installdir)
 			return;
 	}
 #endif
 
-	if(!controlsocketname)
-		asprintf(&controlsocketname, LOCALSTATEDIR "/run/%s.control", identname);
+	if(!controlcookiename)
+		xasprintf(&controlcookiename, "%s/run/%s.cookie", LOCALSTATEDIR, identname);
 
 	if(netname) {
 		if(!confbase)
-			asprintf(&confbase, CONFDIR "/tinc/%s", netname);
+			xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
 		else
-			fprintf(stderr, _("Both netname and configuration directory given, using the latter...\n"));
+			fprintf(stderr, "Both netname and configuration directory given, using the latter...\n");
 	} else {
 		if(!confbase)
-			asprintf(&confbase, CONFDIR "/tinc");
+			xasprintf(&confbase, CONFDIR "/tinc");
 	}
 }
 
-static int fullread(int fd, void *data, size_t datalen) {
-	int rv, len = 0;
+bool recvline(int fd, char *line, size_t len) {
+	static char buffer[4096];
+	static size_t blen = 0;
+	char *newline = NULL;
 
-	while (len < datalen) {
-		rv = read(fd, data + len, datalen - len);
-		if(rv == -1 && errno == EINTR)
+	while(!(newline = memchr(buffer, '\n', blen))) {
+		int result = recv(fd, buffer + blen, sizeof buffer - blen, 0);
+		if(result == -1 && errno == EINTR)
 			continue;
-		else if (rv == -1)
-			return rv;
-		else if (rv == 0) {
-			errno = ENODATA;
-			return -1;
-		}
-		len += rv;
+		else if(result <= 0)
+			return false;
+		blen += result;
 	}
-	return 0;
-}
 
-/*
-   Send a request (raw)
-*/
-static int send_ctl_request(int fd, enum request_type type,
-						   void const *outdata, size_t outdatalen,
-						   int *res_errno_p, void **indata_p,
-						   size_t *indatalen_p) {
-	tinc_ctl_request_t req;
-	int rv;
-	struct iovec vector[2] = {
-		{&req, sizeof(req)},
-		{(void*) outdata, outdatalen}
-	};
-	void *indata;
-
-	if(res_errno_p == NULL)
-		return -1;
-
-	memset(&req, 0, sizeof req);
-	req.length = sizeof req + outdatalen;
-	req.type = type;
-	req.res_errno = 0;
-
-	while((rv = writev(fd, vector, 2)) == -1 && errno == EINTR) ;
-	if(rv != req.length)
-		return -1;
-
-	if(fullread(fd, &req, sizeof req) == -1)
-		return -1;
-
-	if(req.length < sizeof req) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	if(req.length > sizeof req) {
-		if (indata_p == NULL) {
-			errno = EINVAL;
-			return -1;
-		}
-
-		indata = xmalloc(req.length - sizeof req);
-
-		if(fullread(fd, indata, req.length - sizeof req) == -1) {
-			free(indata);
-			return -1;
-		}
+	if(newline - buffer >= len)
+		return false;
 
-		*indata_p = indata;
-		if(indatalen_p != NULL)
-			*indatalen_p = req.length - sizeof req;
-	}
+	len = newline - buffer;
 
-	*res_errno_p = req.res_errno;
+	memcpy(line, buffer, len);
+	line[len] = 0;
+	memmove(buffer, newline + 1, blen - len - 1);
+	blen -= len + 1;
 
-	return 0;
+	return true;
 }
 
-/*
-   Send a request (with printfs)
-*/
-static int send_ctl_request_cooked(int fd, enum request_type type,
-								   void const *outdata, size_t outdatalen)
-{
-	int res_errno = -1;
-	char *buf = NULL;
-	size_t buflen = 0;
+bool sendline(int fd, char *format, ...) {
+	static char buffer[4096];
+	char *p = buffer;
+	size_t blen = 0;
+	va_list ap;
 
-	if(send_ctl_request(fd, type, outdata, outdatalen, &res_errno,
-						(void**) &buf, &buflen)) {
-		fprintf(stderr, _("Error sending request: %s\n"), strerror(errno));
-		return -1;
-	}
+	va_start(ap, format);
+	blen = vsnprintf(buffer, sizeof buffer, format, ap);
+	va_end(ap);
 
-	if(buf != NULL) {
-		printf("%*s", buflen, buf);
-		free(buf);
-	}
+	if(blen < 0 || blen >= sizeof buffer)
+		return false;
+
+	buffer[blen] = '\n';
+	blen++;
 
-	if(res_errno != 0) {
-		fprintf(stderr, _("Server reported error: %s\n"), strerror(res_errno));
-		return -1;
+	while(blen) {
+		int result = send(fd, p, blen, 0);
+		if(result == -1 && errno == EINTR)
+			continue;
+		else if(result <= 0);
+			return false;
+		p += result;
+		blen -= result;
 	}
 
-	return 0;
+	return true;	
 }
 
 int main(int argc, char *argv[], char *envp[]) {
-	struct sockaddr_un addr;
 	int fd;
-	int len;
-	tinc_ctl_greeting_t greeting;
-	tinc_ctl_request_t req;
+	int result;
+	int port;
+	int pid;
 
 	program_name = argv[0];
 
-	setlocale(LC_ALL, "");
-	bindtextdomain(PACKAGE, LOCALEDIR);
-	textdomain(PACKAGE);
-
 	if(!parse_options(argc, argv))
 		return 1;
 	
 	make_names();
 
 	if(show_version) {
-		printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE,
+		printf("%s version %s (built %s %s, protocol %d)\n", PACKAGE,
 			   VERSION, __DATE__, __TIME__, PROT_CURRENT);
-		printf(_("Copyright (C) 1998-2007 Ivo Timmermans, Guus Sliepen and others.\n"
+		printf("Copyright (C) 1998-2009 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"));
+				"see the file COPYING for details.\n");
 
 		return 0;
 	}
@@ -471,7 +388,7 @@ int main(int argc, char *argv[], char *envp[]) {
 	}
 
 	if(optind >= argc) {
-		fprintf(stderr, _("Not enough arguments.\n"));
+		fprintf(stderr, "Not enough arguments.\n");
 		usage(true);
 		return 1;
 	}
@@ -479,124 +396,249 @@ int main(int argc, char *argv[], char *envp[]) {
 	// First handle commands that don't involve connecting to a running tinc daemon.
 
 	if(!strcasecmp(argv[optind], "generate-keys")) {
-		return !keygen(optind > argc ? atoi(argv[optind + 1]) : 1024);
+		return !keygen(optind > argc ? atoi(argv[optind + 1]) : 2048);
 	}
 
 	if(!strcasecmp(argv[optind], "start")) {
 		argv[optind] = NULL;
-		execve("tincd", argv, envp);
-		fprintf(stderr, _("Could not start tincd: %s"), strerror(errno));
+		execve(SBINDIR "/tincd", argv, envp);
+		fprintf(stderr, "Could not start tincd: %s", strerror(errno));
 		return 1;
 	}
 
-	// Now handle commands that do involve connecting to a running tinc daemon.
+	/*
+	 * 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.
+	 */
 
-	if(strlen(controlsocketname) >= sizeof addr.sun_path) {
-		fprintf(stderr, _("Control socket filename too long!\n"));
+	FILE *f = fopen(controlcookiename, "r");
+	if(!f) {
+		fprintf(stderr, "Could not open control socket cookie file %s: %s\n", controlcookiename, strerror(errno));
+		return 1;
+	}
+	if(fscanf(f, "%1024s %d %d", controlcookie, &port, &pid) != 3) {
+		fprintf(stderr, "Could not parse control socket cookie file %s\n", controlcookiename);
 		return 1;
 	}
 
-	fd = socket(PF_UNIX, SOCK_STREAM, 0);
-	if(fd < 0) {
-		fprintf(stderr, _("Cannot create UNIX socket: %s\n"), strerror(errno));
+#ifdef HAVE_MINGW
+	if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
+		fprintf(stderr, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
 		return 1;
 	}
+#endif
 
+	struct sockaddr_in addr;
 	memset(&addr, 0, sizeof addr);
-	addr.sun_family = AF_UNIX;
-	strncpy(addr.sun_path, controlsocketname, sizeof addr.sun_path - 1);
+	addr.sin_family = AF_INET;
+	addr.sin_addr.s_addr = htonl(0x7f000001);
+	addr.sin_port = htons(port);
 
-	if(connect(fd, (struct sockaddr *)&addr, sizeof addr) < 0) {
-		fprintf(stderr, _("Cannot connect to %s: %s\n"), controlsocketname, strerror(errno));
+	fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if(fd < 0) {
+		fprintf(stderr, "Cannot create TCP socket: %s\n", sockstrerror(sockerrno));
 		return 1;
 	}
 
-	if(fullread(fd, &greeting, sizeof greeting) == -1) {
-		fprintf(stderr, _("Cannot read greeting from control socket: %s\n"),
-				strerror(errno));
-		return 1;
+#ifdef HAVE_MINGW
+	unsigned long arg = 0;
+
+	if(ioctlsocket(fd, FIONBIO, &arg) != 0) {
+		fprintf(stderr, "ioctlsocket failed: %s", sockstrerror(sockerrno));
 	}
+#endif
 
-	if(greeting.version != TINC_CTL_VERSION_CURRENT) {
-		fprintf(stderr, _("Version mismatch: server %d, client %d\n"),
-				greeting.version, TINC_CTL_VERSION_CURRENT);
+	if(connect(fd, (struct sockaddr *)&addr, sizeof addr) < 0) {
+			
+		fprintf(stderr, "Cannot connect to %s: %s\n", controlcookiename, sockstrerror(sockerrno));
 		return 1;
 	}
 
-	struct ucred cred;
-	socklen_t credlen = sizeof cred;
+	char line[4096];
+	char data[4096];
+	int code, version, req;
 
-	if(getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &credlen) < 0) {
-		fprintf(stderr, _("Could not obtain PID: %s\n"), strerror(errno));
+	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;
+	}
+
+	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;
 	}
 
 	if(!strcasecmp(argv[optind], "pid")) {
-		printf("%d\n", cred.pid);
+		printf("%d\n", pid);
 		return 0;
 	}
 
 	if(!strcasecmp(argv[optind], "stop")) {
-		return send_ctl_request_cooked(fd, REQ_STOP, NULL, 0) != -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;
+		}
+		return 0;
 	}
 
 	if(!strcasecmp(argv[optind], "reload")) {
-		return send_ctl_request_cooked(fd, REQ_RELOAD, NULL, 0) != -1;
-	}
-	
-	if(!strcasecmp(argv[optind], "restart")) {
-		return send_ctl_request_cooked(fd, REQ_RESTART, NULL, 0) != -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 tinc daemon\n");
+			return 1;
+		}
+		return 0;
 	}
 
-	if(!strcasecmp(argv[optind], "dump")) {
-		if (argc < optind + 2) {
-			fprintf(stderr, _("Not enough arguments.\n"));
-			usage(true);
+	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;
 		}
+		return 0;
+	}
 
-		if(!strcasecmp(argv[optind+1], "nodes")) {
-			return send_ctl_request_cooked(fd, REQ_DUMP_NODES, NULL, 0) != -1;
+	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;
 		}
+		return 0;
+	}
 
-		if(!strcasecmp(argv[optind+1], "edges")) {
-			return send_ctl_request_cooked(fd, REQ_DUMP_EDGES, NULL, 0) != -1;
+	if(!strcasecmp(argv[optind], "dump")) {
+		if(argc < optind + 2) {
+			fprintf(stderr, "Not enough arguments.\n");
+			usage(true);
+			return 1;
 		}
 
-		if(!strcasecmp(argv[optind+1], "subnets")) {
-			return send_ctl_request_cooked(fd, REQ_DUMP_SUBNETS, NULL, 0) != -1;
+		bool do_graph = false;
+		int dumps = 1;
+
+		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;
+			dumps = 2;
+			printf("digraph {\n");
+		} else {
+			fprintf(stderr, "Unknown dump type '%s'.\n", argv[optind+1]);
+			usage(true);
+			return 1;
 		}
 
-		if(!strcasecmp(argv[optind+1], "connections")) {
-			return send_ctl_request_cooked(fd, REQ_DUMP_CONNECTIONS, NULL, 0) != -1;
-		}
+		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(!strcasecmp(argv[optind+1], "graph")) {
-			return send_ctl_request_cooked(fd, REQ_DUMP_GRAPH, NULL, 0) != -1;
+			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);
+			}
 		}
 
-		fprintf(stderr, _("Unknown dump type '%s'.\n"), argv[optind+1]);
-		usage(true);
+		fprintf(stderr, "Error receiving dump\n");
 		return 1;
 	}
 
 	if(!strcasecmp(argv[optind], "purge")) {
-		return send_ctl_request_cooked(fd, REQ_PURGE, NULL, 0) != -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 tinc daemon\n");
+			return 1;
+		}
+		return 0;
 	}
 
 	if(!strcasecmp(argv[optind], "debug")) {
-		int debuglevel;
+		int debuglevel, origlevel;
 
 		if(argc != optind + 2) {
 			fprintf(stderr, "Invalid arguments.\n");
 			return 1;
 		}
 		debuglevel = atoi(argv[optind+1]);
-		return send_ctl_request_cooked(fd, REQ_SET_DEBUG, &debuglevel,
-									   sizeof(debuglevel)) != -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;
+		}
+
+		fprintf(stderr, "Old level %d, new level %d\n", origlevel, debuglevel);
+		return 0;
+	}
+
+	if(!strcasecmp(argv[optind], "connect")) {
+		if(argc != optind + 2) {
+			fprintf(stderr, "Invalid arguments.\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);
+			return 1;
+		}
+		return 0;
 	}
 
-	fprintf(stderr, _("Unknown command `%s'.\n"), argv[optind]);
+	if(!strcasecmp(argv[optind], "disconnect")) {
+		if(argc != optind + 2) {
+			fprintf(stderr, "Invalid arguments.\n");
+			return 1;
+		}
+		char *name = argv[optind + 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;
+		}
+		return 0;
+	}
+
+#ifdef HAVE_CURSES
+	if(!strcasecmp(argv[optind], "top")) {
+		top(fd);
+		return 0;
+	}
+#endif
+
+	fprintf(stderr, "Unknown command `%s'.\n", argv[optind]);
 	usage(true);
 	
 	close(fd);