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

diff --git a/src/tincctl.c b/src/tincctl.c
index 632e7ac6..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;
@@ -93,6 +95,9 @@ static void usage(bool status) {
 				"  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");
 	}
@@ -296,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;
@@ -323,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;
@@ -517,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);
@@ -531,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]);
@@ -626,6 +629,13 @@ int main(int argc, char *argv[], char *envp[]) {
 		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);