X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=dd0bbcc220677d97bfbc1f83cacb677e54d18ed9;hb=a717b9bcfbe811787fd6718fb3f8fb3f272bcfb9;hp=c1cabdb0944c2f7db348ca1a510a6f11e84c70c2;hpb=368727c3dac4a1f8343e2e0eccf5bc62d9b197e2;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index c1cabdb0..dd0bbcc2 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -57,11 +57,12 @@ static char *name = NULL;
 static char *identname = NULL;          /* program name for syslog */
 static char *pidfilename = NULL;        /* pid file location */
 static char *confdir = NULL;
-static char controlcookie[1024];
+static char controlcookie[1025];
 char *netname = NULL;
 char *confbase = NULL;
 static char *tinc_conf = NULL;
 static char *hosts_dir = NULL;
+struct timeval now;
 
 // Horrible global variables...
 static int pid = 0;
@@ -134,7 +135,7 @@ static void usage(bool status) {
 				"  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"
+				"    [reachable] nodes        - all known nodes in the VPN\n"
 				"    edges                    - all known connections in the VPN\n"
 				"    subnets                  - all known subnets in the VPN\n"
 				"    connections              - all meta connections with ourself\n"
@@ -708,8 +709,8 @@ static bool connect_tincd(bool verbose) {
 		return false;
 	}
 
-	char host[128];
-	char port[128];
+	char host[129];
+	char port[129];
 
 	if(fscanf(f, "%20d %1024s %128s port %128s", &pid, controlcookie, host, port) != 4) {
 		if(verbose)
@@ -911,6 +912,19 @@ static int cmd_reload(int argc, char *argv[]) {
 }
 
 static int cmd_dump(int argc, char *argv[]) {
+	bool only_reachable = false;
+
+	if(argc > 2 && !strcasecmp(argv[1], "reachable")) {
+		if(strcasecmp(argv[2], "nodes")) {
+			fprintf(stderr, "`reachable' only supported for nodes.\n");
+			usage(true);
+			return 1;
+		}
+		only_reachable = true;
+		argv++;
+		argc--;
+	}
+
 	if(argc != 2) {
 		fprintf(stderr, "Invalid number of arguments.\n");
 		usage(true);
@@ -985,8 +999,10 @@ static int cmd_dump(int argc, char *argv[]) {
 					fprintf(stderr, "Unable to parse node dump from tincd: %s\n", line);
 					return 1;
 				}
+
+				memcpy(&status, &status_int, sizeof status);
+
 				if(do_graph) {
-					memcpy(&status, &status_int, sizeof status);
 					const char *color = "black";
 					if(!strcmp(host, "MYSELF"))
 						color = "green";
@@ -1000,6 +1016,8 @@ static int cmd_dump(int argc, char *argv[]) {
 						color = "green";
 					printf(" %s [label = \"%s\", color = \"%s\"%s];\n", node, node, color, strcmp(host, "MYSELF") ? "" : ", style = \"filled\"");
 				} else {
+					if(only_reachable && !status.reachable)
+						continue;
 					printf("%s at %s port %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)\n",
 							node, host, port, cipher, digest, maclength, compression, options, status_int, nexthop, via, distance, pmtu, minmtu, maxmtu);
 				}
@@ -1233,6 +1251,7 @@ static struct {
 } const variables[] = {
 	/* Server configuration */
 	{"AddressFamily", VAR_SERVER},
+	{"AutoConnect", VAR_SERVER},
 	{"BindToAddress", VAR_SERVER | VAR_MULTIPLE},
 	{"BindToInterface", VAR_SERVER},
 	{"Broadcast", VAR_SERVER},
@@ -1945,7 +1964,7 @@ static char *complete_command(const char *text, int state) {
 }
 
 static char *complete_dump(const char *text, int state) {
-	const char *matches[] = {"nodes", "edges", "subnets", "connections", "graph", NULL};
+	const char *matches[] = {"reachable", "nodes", "edges", "subnets", "connections", "graph", NULL};
 	static int i;
 
 	if(!state)