X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=641fb9c4edd9de90e6f0af9ff8537ab5b4274305;hb=8de8f1d9e2c2c02d4a14a5506e7d0d914dc328da;hp=8a07dfa020cb33951b331820a6c1c686e280f083;hpb=edebf579f2ea29e6e84360cb13731f5858a1555b;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 8a07dfa0..641fb9c4 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-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
@@ -26,6 +26,8 @@
 #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;
@@ -58,7 +60,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},
+	{"controlcookie", required_argument, NULL, 5},
 	{NULL, 0, NULL, 0}
 };
 
@@ -92,6 +94,10 @@ static void usage(bool status) {
 				"  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
 				"\n");
 		printf("Report bugs to tinc@tinc-vpn.org.\n");
 	}
@@ -282,7 +288,7 @@ static void make_names(void) {
 #endif
 
 	if(!controlcookiename)
-		xasprintf(&controlcookiename, "%s/run/%s.control/socket", LOCALSTATEDIR, identname);
+		xasprintf(&controlcookiename, "%s/run/%s.cookie", LOCALSTATEDIR, identname);
 
 	if(netname) {
 		if(!confbase)
@@ -295,7 +301,7 @@ static void make_names(void) {
 	}
 }
 
-static bool recvline(int fd, char *line, size_t len) {
+bool recvline(int fd, char *line, size_t len) {
 	static char buffer[4096];
 	static size_t blen = 0;
 	char *newline = NULL;
@@ -322,7 +328,7 @@ static bool recvline(int fd, char *line, size_t len) {
 	return true;
 }
 
-static bool sendline(int fd, char *format, ...) {
+bool sendline(int fd, char *format, ...) {
 	static char buffer[4096];
 	char *p = buffer;
 	size_t blen = 0;
@@ -436,11 +442,13 @@ int main(int argc, char *argv[], char *envp[]) {
 		return 1;
 	}
 
+#ifdef HAVE_MINGW
 	unsigned long arg = 0;
 
 	if(ioctlsocket(fd, FIONBIO, &arg) != 0) {
 		fprintf(stderr, "ioctlsocket failed: %s", sockstrerror(sockerrno));
 	}
+#endif
 
 	if(connect(fd, (struct sockaddr *)&addr, sizeof addr) < 0) {
 			
@@ -514,7 +522,6 @@ int main(int argc, char *argv[], char *envp[]) {
 		}
 
 		bool do_graph = false;
-		int dumps = 1;
 
 		if(!strcasecmp(argv[optind+1], "nodes"))
 			sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
@@ -528,7 +535,6 @@ int main(int argc, char *argv[], char *envp[]) {
 			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]);
@@ -538,7 +544,7 @@ int main(int argc, char *argv[], char *envp[]) {
 
 		while(recvline(fd, line, sizeof line)) {
 			char node1[4096], node2[4096];
-			int n = sscanf(line, "%d %d %s to %s", &code, &req, &node1, &node2);
+			int n = sscanf(line, "%d %d %s to %s", &code, &req, node1, node2);
 			if(n == 2) {
 				if(do_graph && req == REQ_DUMP_NODES)
 					continue;
@@ -584,7 +590,7 @@ int main(int argc, char *argv[], char *envp[]) {
 		debuglevel = atoi(argv[optind+1]);
 
 		sendline(fd, "%d %d %d", CONTROL, REQ_SET_DEBUG, debuglevel);
-		if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_SET_DEBUG) {
+		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;
 		}
@@ -593,6 +599,43 @@ int main(int argc, char *argv[], char *envp[]) {
 		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;
+	}
+
+	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);