X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=ef5233c5866bfb199ac5be88b625ed82d467210b;hb=e6b21e1a510691a86dcc1ecdf71a80a7c62ff17f;hp=632e7ac6efa8720197e7623b69b429087c49f528;hpb=103543aa2c15d9f1e2aa313a2e593a7524cce484;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 632e7ac6..ef5233c5 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,21 +26,23 @@
 #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;
+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;
+static bool show_version = false;
 
 /* If nonzero, it will attempt to kill a running tincd and exit. */
-int kill_tincd = 0;
+static int kill_tincd = 0;
 
 /* If nonzero, generate public/private keypair for this host/net. */
-int generate_keys = 0;
+static int generate_keys = 0;
 
 static char *name = NULL;
 static char *identname = NULL;				/* program name for syslog */
@@ -93,6 +95,10 @@ 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
+				"  pcap                       Dump traffic in pcap format\n"
 				"\n");
 		printf("Report bugs to tinc@tinc-vpn.org.\n");
 	}
@@ -153,7 +159,7 @@ 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;
@@ -296,9 +302,10 @@ static void make_names(void) {
 	}
 }
 
-static bool recvline(int fd, char *line, size_t len) {
-	static char buffer[4096];
-	static size_t blen = 0;
+static char buffer[4096];
+static size_t blen = 0;
+
+bool recvline(int fd, char *line, size_t len) {
 	char *newline = NULL;
 
 	while(!(newline = memchr(buffer, '\n', blen))) {
@@ -323,7 +330,24 @@ static bool recvline(int fd, char *line, size_t len) {
 	return true;
 }
 
-static bool sendline(int fd, char *format, ...) {
+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;
+	}
+
+	memcpy(data, buffer, len);
+	memmove(buffer, buffer + len, blen - len);
+	blen -= len;
+
+	return true;
+}
+
+bool sendline(int fd, char *format, ...) {
 	static char buffer[4096];
 	char *p = buffer;
 	size_t blen = 0;
@@ -352,6 +376,57 @@ static bool sendline(int fd, char *format, ...) {
 	return true;	
 }
 
+void pcap(int fd, FILE *out) {
+	sendline(fd, "%d %d", CONTROL, REQ_PCAP);
+	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,
+		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);
+	}
+}
+
 int main(int argc, char *argv[], char *envp[]) {
 	int fd;
 	int result;
@@ -517,7 +592,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 +605,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 +699,18 @@ int main(int argc, char *argv[], char *envp[]) {
 		return 0;
 	}
 
+#ifdef HAVE_CURSES
+	if(!strcasecmp(argv[optind], "top")) {
+		top(fd);
+		return 0;
+	}
+#endif
+
+	if(!strcasecmp(argv[optind], "pcap")) {
+		pcap(fd, stdout);
+		return 0;
+	}
+
 	fprintf(stderr, "Unknown command `%s'.\n", argv[optind]);
 	usage(true);