X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=0337129f8b7f25881f057c3a49a92084369954fa;hb=a444ec396456a25546a4ab3d185c7fb5e4bb7ae3;hp=784c6a94759abe3e8b3a3c9e1303729f163c450b;hpb=c388527e341658dc915dd67c90bbc9b52b8539c0;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 784c6a94..0337129f 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1,6 +1,6 @@
 /*
     tincctl.c -- Controlling a running tincd
-    Copyright (C) 2007-2009 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2012 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
@@ -24,26 +24,25 @@
 #include "xalloc.h"
 #include "protocol.h"
 #include "control_common.h"
+#include "ecdsagen.h"
 #include "rsagen.h"
 #include "utils.h"
+#include "tincctl.h"
+#include "top.h"
 
 /* The name this program was run with. */
-char *program_name = NULL;
+static char *program_name = NULL;
 
 /* If nonzero, display usage information and exit. */
-bool show_help = false;
+static bool show_help = false;
 
 /* If nonzero, print the version on standard output and exit.  */
-bool show_version = false;
-
-/* If nonzero, it will attempt to kill a running tincd and exit. */
-int kill_tincd = 0;
-
-/* If nonzero, generate public/private keypair for this host/net. */
-int generate_keys = 0;
+static bool show_version = false;
 
+static char *name = NULL;
 static char *identname = NULL;				/* program name for syslog */
-static char *controlsocketname = NULL;			/* pid file location */
+static char *pidfilename = NULL;			/* pid file location */
+static char controlcookie[1024];
 char *netname = NULL;
 char *confbase = NULL;
 
@@ -56,7 +55,7 @@ static struct option const long_options[] = {
 	{"net", required_argument, NULL, 'n'},
 	{"help", no_argument, NULL, 1},
 	{"version", no_argument, NULL, 2},
-	{"controlsocket", required_argument, NULL, 5},
+	{"pidfile", required_argument, NULL, 5},
 	{NULL, 0, NULL, 0}
 };
 
@@ -67,19 +66,22 @@ static void usage(bool status) {
 	else {
 		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"
-				"      --help                    Display this help and exit.\n"
-				"      --version                 Output version information and exit.\n"
+				"  -c, --config=DIR        Read configuration options from DIR.\n"
+				"  -n, --net=NETNAME       Connect to net NETNAME.\n"
+				"      --pidfile=FILENAME  Read control cookie from FILENAME.\n"
+				"      --help              Display this help and exit.\n"
+				"      --version           Output version information and exit.\n"
 				"\n"
 				"Valid commands are:\n"
+				"  init [name]                Create initial configuration files.\n"
 				"  start                      Start tincd.\n"
 				"  stop                       Stop tincd.\n"
 				"  restart                    Restart tincd.\n"
-				"  reload                     Reload configuration of running tincd.\n"
+				"  reload                     Partially reload configuration of running tincd.\n"
 				"  pid                        Show PID of currently running tincd.\n"
-				"  generate-keys [bits]       Generate a new public/private keypair.\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"
 				"    edges                    - all known connections in the VPN\n"
@@ -89,7 +91,12 @@ static void usage(bool status) {
 				"  purge                      Purge unreachable nodes\n"
 				"  debug N                    Set debug level\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
+				"  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"
 				"\n");
 		printf("Report bugs to tinc@tinc-vpn.org.\n");
 	}
@@ -121,7 +128,7 @@ static bool parse_options(int argc, char **argv) {
 				break;
 
 			case 5:					/* open control socket here */
-				controlsocketname = xstrdup(optarg);
+				pidfilename = xstrdup(optarg);
 				break;
 
 			case '?':
@@ -133,15 +140,20 @@ static bool parse_options(int argc, char **argv) {
 		}
 	}
 
+	if(!netname) {
+		netname = getenv("NETNAME");
+		if(netname)
+			netname = xstrdup(netname);
+	}
+
 	return true;
 }
 
-FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
+static FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
 	FILE *r;
 	char *directory;
 	char buf[PATH_MAX];
 	char buf2[PATH_MAX];
-	size_t len;
 
 	/* Check stdin and stdout */
 	if(isatty(0) && isatty(1)) {
@@ -150,13 +162,13 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
 				what, filename);
 		fflush(stdout);
 
-		if(fgets(buf, sizeof buf, stdin) < 0) {
+		if(fgets(buf, sizeof buf, stdin) == NULL) {
 			fprintf(stderr, "Error while reading stdin: %s\n",
 					strerror(errno));
 			return NULL;
 		}
 
-		len = strlen(buf);
+		size_t len = strlen(buf);
 		if(len)
 			buf[--len] = 0;
 
@@ -189,14 +201,72 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
 	return r;
 }
 
+/*
+  Generate a public/private ECDSA keypair, and ask for a file to store
+  them in.
+*/
+static bool ecdsa_keygen() {
+	ecdsa_t key;
+	FILE *f;
+	char *filename;
+
+	fprintf(stderr, "Generating ECDSA keypair:\n");
+
+	if(!ecdsa_generate(&key)) {
+		fprintf(stderr, "Error during key generation!\n");
+		return false;
+	} else
+		fprintf(stderr, "Done.\n");
+
+	xasprintf(&filename, "%s/ecdsa_key.priv", confbase);
+	f = ask_and_open(filename, "private ECDSA key", "a");
+
+	if(!f)
+		return false;
+  
+#ifdef HAVE_FCHMOD
+	/* Make it unreadable for others. */
+	fchmod(fileno(f), 0600);
+#endif
+		
+	if(ftell(f))
+		fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n");
+
+	ecdsa_write_pem_private_key(&key, f);
+
+	fclose(f);
+	free(filename);
+
+	if(name)
+		xasprintf(&filename, "%s/hosts/%s", confbase, name);
+	else
+		xasprintf(&filename, "%s/ecdsa_key.pub", confbase);
+
+	f = ask_and_open(filename, "public ECDSA 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");
+
+	char *pubkey = ecdsa_get_base64_public_key(&key);
+	fprintf(f, "ECDSAPublicKey = %s\n", pubkey);
+	free(pubkey);
+
+	fclose(f);
+	free(filename);
+
+	return true;
+}
+
 /*
   Generate a public/private RSA keypair, and ask for a file to store
   them in.
 */
-static bool keygen(int bits) {
+static bool rsa_keygen(int bits) {
 	rsa_t key;
 	FILE *f;
-	char *name = NULL;
 	char *filename;
 
 	fprintf(stderr, "Generating %d bits keys:\n", bits);
@@ -272,14 +342,16 @@ static void make_names(void) {
 					xasprintf(&confbase, "%s", installdir);
 			}
 		}
+		if(!pidfilename)
+			xasprintf(&pidfilename, "%s/pid", confbase);
 		RegCloseKey(key);
 		if(*installdir)
 			return;
 	}
 #endif
 
-	if(!controlsocketname)
-		xasprintf(&controlsocketname, "%s/run/%s.control/socket", LOCALSTATEDIR, identname);
+	if(!pidfilename)
+		xasprintf(&pidfilename, "%s/run/%s.pid", LOCALSTATEDIR, identname);
 
 	if(netname) {
 		if(!confbase)
@@ -292,123 +364,190 @@ static void make_names(void) {
 	}
 }
 
-static int fullread(int fd, void *data, size_t datalen) {
-	int rv, len = 0;
+static char buffer[4096];
+static size_t blen = 0;
 
-	while(len < datalen) {
-		rv = recv(fd, data + len, datalen - len, 0);
-		if(rv == -1 && errno == EINTR)
+bool recvline(int fd, char *line, size_t len) {
+	char *newline = NULL;
+
+	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) {
-#ifdef HAVE_MINGW
-			errno = 0;
-#else
-			errno = ENODATA;
-#endif
-			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;
-	void *indata;
-
-	memset(&req, 0, sizeof req);
-	req.length = sizeof req + outdatalen;
-	req.type = type;
-	req.res_errno = 0;
-
-#ifdef HAVE_MINGW
-	if(send(fd, (void *)&req, sizeof req, 0) != sizeof req || send(fd, outdata, outdatalen, 0) != outdatalen)
-		return -1;
-#else
-	struct iovec vector[2] = {
-		{&req, sizeof req},
-		{(void*) outdata, outdatalen}
-	};
+	if(newline - buffer >= len)
+		return false;
 
-	if(res_errno_p == NULL)
-		return -1;
+	len = newline - buffer;
 
-	while((rv = writev(fd, vector, 2)) == -1 && errno == EINTR) ;
-	if(rv != req.length)
-		return -1;
-#endif
+	memcpy(line, buffer, len);
+	line[len] = 0;
+	memmove(buffer, newline + 1, blen - len - 1);
+	blen -= len + 1;
 
-	if(fullread(fd, &req, sizeof req) == -1)
-		return -1;
+	return true;
+}
 
-	if(req.length < sizeof req) {
-		errno = EINVAL;
-		return -1;
+static bool recvdata(int fd, char *data, size_t len) {
+	while(blen < len) {
+		int result = recv(fd, buffer + blen, sizeof buffer - blen, 0);
+		if(result == -1 && errno == EINTR)
+			continue;
+		else if(result <= 0)
+			return false;
+		blen += result;
 	}
 
-	if(req.length > sizeof req) {
-		if(indata_p == NULL) {
-			errno = EINVAL;
-			return -1;
-		}
+	memcpy(data, buffer, len);
+	memmove(buffer, buffer + len, blen - len);
+	blen -= len;
 
-		indata = xmalloc(req.length - sizeof req);
+	return true;
+}
 
-		if(fullread(fd, indata, req.length - sizeof req) == -1) {
-			free(indata);
-			return -1;
-		}
+bool sendline(int fd, char *format, ...) {
+	static char buffer[4096];
+	char *p = buffer;
+	int blen = 0;
+	va_list ap;
 
-		*indata_p = indata;
-		if(indatalen_p != NULL)
-			*indatalen_p = req.length - sizeof req;
+	va_start(ap, format);
+	blen = vsnprintf(buffer, sizeof buffer, format, ap);
+	va_end(ap);
+
+	if(blen < 1 || blen >= sizeof buffer)
+		return false;
+
+	buffer[blen] = '\n';
+	blen++;
+
+	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;
 	}
 
-	*res_errno_p = req.res_errno;
+	return true;	
+}
 
-	return 0;
+static void pcap(int fd, FILE *out, int snaplen) {
+	sendline(fd, "%d %d %d", CONTROL, REQ_PCAP, snaplen);
+	char data[9018];
+
+	struct {
+		uint32_t magic;
+		uint16_t major;
+		uint16_t minor;
+		uint32_t tz_offset;
+		uint32_t tz_accuracy;
+		uint32_t snaplen;
+		uint32_t ll_type;
+	} header = {
+		0xa1b2c3d4,
+		2, 4,
+		0, 0,
+		snaplen ?: sizeof data,
+		1,
+	};
+
+	struct {
+		uint32_t tv_sec;
+		uint32_t tv_usec;
+		uint32_t len;
+		uint32_t origlen;
+	} packet;
+
+	struct timeval tv;
+
+	fwrite(&header, sizeof header, 1, out);
+	fflush(out);
+
+	char line[32];
+	while(recvline(fd, line, sizeof line)) {
+		int code, req, len;
+		int n = sscanf(line, "%d %d %d", &code, &req, &len);
+		gettimeofday(&tv, NULL);
+		if(n != 3 || code != CONTROL || req != REQ_PCAP || len < 0 || len > sizeof data)
+			break;
+		if(!recvdata(fd, data, len))
+			break;
+		packet.tv_sec = tv.tv_sec;
+		packet.tv_usec = tv.tv_usec;
+		packet.len = len;
+		packet.origlen = len;
+		fwrite(&packet, sizeof packet, 1, out);
+		fwrite(data, len, 1, out);
+		fflush(out);
+	}
 }
 
-/*
-   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;
+static void logcontrol(int fd, FILE *out, int level) {
+	sendline(fd, "%d %d %d", CONTROL, REQ_LOG, level);
+	char data[1024];
+	char line[32];
+
+	while(recvline(fd, line, sizeof line)) {
+		int code, req, len;
+		int n = sscanf(line, "%d %d %d", &code, &req, &len);
+		if(n != 3 || code != CONTROL || req != REQ_LOG || len < 0 || len > sizeof data)
+			break;
+		if(!recvdata(fd, data, len))
+			break;
+		fwrite(data, len, 1, out);
+		fputc('\n', out);
+		fflush(out);
+	}
+}
 
-	if(send_ctl_request(fd, type, outdata, outdatalen, &res_errno,
-						(void**) &buf, &buflen)) {
-		fprintf(stderr, "Error sending request: %s\n", strerror(errno));
-		return -1;
+#ifdef HAVE_MINGW
+static bool remove_service(void) {
+	SC_HANDLE manager = NULL;
+	SC_HANDLE service = NULL;
+	SERVICE_STATUS status = {0};
+
+	manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+	if(!manager) {
+		fprintf(stderr, "Could not open service manager: %s\n", winerror(GetLastError()));
+		return false;
 	}
 
-	if(buf != NULL) {
-		printf("%*s", (int)buflen, buf);
-		free(buf);
+	service = OpenService(manager, identname, SERVICE_ALL_ACCESS);
+
+	if(!service) {
+		fprintf(stderr, "Could not open %s service: %s\n", identname, winerror(GetLastError()));
+		return false;
 	}
 
-	if(res_errno != 0) {
-		fprintf(stderr, "Server reported error: %s\n", strerror(res_errno));
-		return -1;
+	if(!ControlService(service, SERVICE_CONTROL_STOP, &status))
+		fprintf(stderr, "Could not stop %s service: %s\n", identname, winerror(GetLastError()));
+	else
+		fprintf(stderr, "%s service stopped\n", identname);
+
+	if(!DeleteService(service)) {
+		fprintf(stderr, "Could not remove %s service: %s\n", identname, winerror(GetLastError()));
+		return false;
 	}
 
-	return 0;
+	fprintf(stderr, "%s service removed\n", identname);
+
+	return true;
 }
+#endif
 
-int main(int argc, char *argv[], char *envp[]) {
-	tinc_ctl_greeting_t greeting;
+int main(int argc, char *argv[]) {
 	int fd;
 	int result;
+	char host[128];
+	char port[128];
+	int pid;
 
 	program_name = argv[0];
 
@@ -418,9 +557,9 @@ int main(int argc, char *argv[], char *envp[]) {
 	make_names();
 
 	if(show_version) {
-		printf("%s version %s (built %s %s, protocol %d)\n", PACKAGE,
-			   VERSION, __DATE__, __TIME__, PROT_CURRENT);
-		printf("Copyright (C) 1998-2009 Ivo Timmermans, Guus Sliepen and others.\n"
+		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"
@@ -442,17 +581,119 @@ 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-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 !keygen(optind > argc ? atoi(argv[optind + 1]) : 2048);
+		return !(rsa_keygen(optind < argc - 1 ? atoi(argv[optind + 1]) : 2048) && ecdsa_keygen());
 	}
 
 	if(!strcasecmp(argv[optind], "start")) {
-		argv[optind] = NULL;
-		execve(SBINDIR "/tincd", argv, envp);
-		fprintf(stderr, "Could not start tincd: %s", strerror(errno));
+		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;
 	}
 
+	if(!strcasecmp(argv[optind], "init")) {
+		char *filename = NULL;
+		xasprintf(&filename, "%s/tinc.conf", confbase);
+		if(!access(confbase, F_OK)) {
+			fprintf(stderr, "Configuration file %s already exists!\n", filename);
+			return 1;
+		}
+
+		if(optind >= argc - 1) {
+			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 = strlen(buf);
+				if(len)
+					buf[--len] = 0;
+				if(!len) {
+					fprintf(stderr, "No name given!\n");
+					return 1;
+				}
+				name = strdup(buf);
+			} else {
+				fprintf(stderr, "No Name given!\n");
+				return 1;
+			}
+		} else {
+			name = strdup(argv[optind + 1]);
+			if(!*name) {
+				fprintf(stderr, "No Name given!\n");
+				return 1;
+			}
+		}
+
+		for(int i = 0; i < strlen(name); i++) {
+			if(!isalnum(name[i]) && name[i] != '_') {
+				fprintf(stderr, "Invalid Name! Only a-z, A-Z, 0-9 and _ are allowed characters.\n");
+				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 *filename2 = NULL;
+		xasprintf(&filename2, "%s/hosts", confbase);
+		if(mkdir(filename2, 0755) && errno != EEXIST) {
+			fprintf(stderr, "Could not create directory %s: %s\n", filename, strerror(errno));
+			return 1;
+		}
+
+		FILE *f = fopen(filename, "w");
+		if(!f) {
+			fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
+			return 1;
+		}
+
+		fprintf(f, "Name = %s\n", name);
+		fclose(f);
+
+		fclose(stdin);
+		if(!rsa_keygen(2048) || !ecdsa_keygen())
+			return false;
+
+		return true;
+	}
+
 	/*
 	 * Now handle commands that do involve connecting to a running tinc daemon.
 	 * Authenticate the server by ensuring the parent directory can be
@@ -460,100 +701,119 @@ int main(int argc, char *argv[], char *envp[]) {
 	 * ancestors are writable only by trusted users, which we don't verify.
 	 */
 
+	FILE *f = fopen(pidfilename, "r");
+	if(!f) {
+		fprintf(stderr, "Could not open pid file %s: %s\n", pidfilename, strerror(errno));
+		return 1;
+	}
+	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;
+	}
+
 #ifdef HAVE_MINGW
 	if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
 		fprintf(stderr, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
 		return 1;
 	}
+#endif
+
+	struct addrinfo hints = {
+		.ai_family = AF_UNSPEC,
+		.ai_socktype = SOCK_STREAM,
+		.ai_protocol = IPPROTO_TCP,
+		.ai_flags = 0,
+	};
 
-	struct sockaddr_in addr;
-	memset(&addr, 0, sizeof addr);
-	addr.sin_family = AF_INET;
-	addr.sin_addr.s_addr = htonl(0x7f000001);
-	addr.sin_port = htons(55555);
+	struct addrinfo *res = NULL;
 
-	fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if(getaddrinfo(host, port, &hints, &res) || !res) {
+		fprintf(stderr, "Cannot resolve %s port %s: %s", host, port, strerror(errno));
+		return 1;
+	}
+
+	fd = socket(res->ai_family, SOCK_STREAM, IPPROTO_TCP);
 	if(fd < 0) {
 		fprintf(stderr, "Cannot create TCP socket: %s\n", sockstrerror(sockerrno));
 		return 1;
 	}
 
+#ifdef HAVE_MINGW
 	unsigned long arg = 0;
 
 	if(ioctlsocket(fd, FIONBIO, &arg) != 0) {
 		fprintf(stderr, "ioctlsocket failed: %s", sockstrerror(sockerrno));
 	}
-#else
-	struct sockaddr_un addr;
-	struct stat statbuf;
-	char *lastslash = strrchr(controlsocketname, '/');
-	if(lastslash != NULL) {
-		/* control socket is not in cwd; stat its parent */
-		*lastslash = 0;
-		result = stat(controlsocketname, &statbuf);
-		*lastslash = '/';
-	} else
-		result = stat(".", &statbuf);
-
-	if(result < 0) {
-		fprintf(stderr, "Unable to check control socket directory permissions: %s\n", strerror(errno));
-		return 1;
-	}
-
-	if(statbuf.st_uid != 0 || (statbuf.st_mode & S_IXOTH) != 0 || (statbuf.st_gid != 0 && (statbuf.st_mode & S_IXGRP)) != 0) {
-		fprintf(stderr, "Insecure permissions on control socket directory\n");
-		return 1;
-	}
-
-	if(strlen(controlsocketname) >= sizeof addr.sun_path) {
-		fprintf(stderr, "Control socket filename too long!\n");
-		return 1;
-	}
+#endif
 
-	fd = socket(PF_UNIX, SOCK_STREAM, 0);
-	if(fd < 0) {
-		fprintf(stderr, "Cannot create UNIX socket: %s\n", strerror(errno));
+	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;
 	}
 
-	memset(&addr, 0, sizeof addr);
-	addr.sun_family = AF_UNIX;
-	strncpy(addr.sun_path, controlsocketname, sizeof addr.sun_path - 1);
-#endif
+	freeaddrinfo(res);
 
-	if(connect(fd, (struct sockaddr *)&addr, sizeof addr) < 0) {
-			
-		fprintf(stderr, "Cannot connect to %s: %s\n", controlsocketname, sockstrerror(sockerrno));
-		return 1;
-	}
+	char line[4096];
+	char data[4096];
+	int code, version, req;
 
-	if(fullread(fd, &greeting, sizeof greeting) == -1) {
+	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;
 	}
 
-	if(greeting.version != TINC_CTL_VERSION_CURRENT) {
-		fprintf(stderr, "Version mismatch: server %d, client %d\n",
-				greeting.version, TINC_CTL_VERSION_CURRENT);
+	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", greeting.pid);
+		printf("%d\n", pid);
 		return 0;
 	}
 
 	if(!strcasecmp(argv[optind], "stop")) {
-		return send_ctl_request_cooked(fd, REQ_STOP, NULL, 0) != -1;
+#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;
+		}
+#else
+		if(!remove_service())
+			return 1;
+#endif
+		return 0;
 	}
 
 	if(!strcasecmp(argv[optind], "reload")) {
-		return send_ctl_request_cooked(fd, REQ_RELOAD, 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], "restart")) {
-		return send_ctl_request_cooked(fd, REQ_RESTART, NULL, 0) != -1;
+		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], "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], "dump")) {
@@ -563,53 +823,129 @@ int main(int argc, char *argv[], char *envp[]) {
 			return 1;
 		}
 
-		if(!strcasecmp(argv[optind+1], "nodes")) {
-			return send_ctl_request_cooked(fd, REQ_DUMP_NODES, NULL, 0) != -1;
-		}
-
-		if(!strcasecmp(argv[optind+1], "edges")) {
-			return send_ctl_request_cooked(fd, REQ_DUMP_EDGES, NULL, 0) != -1;
-		}
-
-		if(!strcasecmp(argv[optind+1], "subnets")) {
-			return send_ctl_request_cooked(fd, REQ_DUMP_SUBNETS, NULL, 0) != -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);
+			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], "retry")) {
-		return send_ctl_request_cooked(fd, REQ_RETRY, NULL, 0) != -1;
+	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;
 	}
 
-	if(!strcasecmp(argv[optind], "reload")) {
-		return send_ctl_request_cooked(fd, REQ_RELOAD, NULL, 0) != -1;
+	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
+
+	if(!strcasecmp(argv[optind], "pcap")) {
+		pcap(fd, stdout, optind < argc - 1 ? atoi(argv[optind + 1]) : 0);
+		return 0;
+	}
+
+	if(!strcasecmp(argv[optind], "log")) {
+		logcontrol(fd, stdout, optind < argc - 1 ? atoi(argv[optind + 1]) : -1);
+		return 0;
 	}
 
 	fprintf(stderr, "Unknown command `%s'.\n", argv[optind]);