X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Finfo.c;h=2a6934b4a8ac5dfa15e9c9d1476a012c87bc7c0c;hp=0ff56cde10789fa71379877591b8509d5c87fb6f;hb=af81c436d6e11a53803747af7cc8ecfd449ccd4c;hpb=7a71d48009e03ff1143a6e1084803f456a27c849

diff --git a/src/info.c b/src/info.c
index 0ff56cde..2a6934b4 100644
--- a/src/info.c
+++ b/src/info.c
@@ -1,6 +1,6 @@
 /*
     info.c -- Show information about a node, subnet or address
-    Copyright (C) 2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2012-2017 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,16 +24,18 @@
 #include "subnet.h"
 #include "tincctl.h"
 #include "info.h"
+#include "utils.h"
 #include "xalloc.h"
 
 void logger(int level, int priority, const char *format, ...) {
 	va_list ap;
-        va_start(ap, format);
-        vfprintf(stderr, format, ap);
-        va_end(ap);
+	va_start(ap, format);
+	vfprintf(stderr, format, ap);
+	va_end(ap);
+	fputc('\n', stderr);
 }
 
-static char *strip_weight(char *netstr) {
+char *strip_weight(char *netstr) {
 	int len = strlen(netstr);
 	if(len >= 3 && !strcmp(netstr + len - 3, "#10"))
 		netstr[len - 3] = 0;
@@ -48,6 +50,7 @@ static int info_node(int fd, const char *item) {
 	char line[4096];
 
 	char node[4096];
+	char id[4096];
 	char from[4096];
 	char to[4096];
 	char subnet[4096];
@@ -56,24 +59,24 @@ static int info_node(int fd, const char *item) {
 	char via[4096];
 	char nexthop[4096];
 	int code, req, cipher, digest, maclength, compression, distance;
-       	short int pmtu, minmtu, maxmtu;
+	short int pmtu, minmtu, maxmtu;
 	unsigned int options;
+	union {
+		node_status_t bits;
+		uint32_t raw;
+	} status_union;
 	node_status_t status;
+	long int last_state_change;
 
 	while(recvline(fd, line, sizeof line)) {
-		int n = sscanf(line, "%d %d %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)", &code, &req, node, host, port, &cipher, &digest, &maclength, &compression, &options, (unsigned *)&status, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu);
+		int n = sscanf(line, "%d %d %4095s %4095s %4095s port %4095s %d %d %d %d %x %"PRIx32" %4095s %4095s %d %hd %hd %hd %ld", &code, &req, node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status_union.raw, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change);
 
 		if(n == 2)
 			break;
 
-		if(n != 17) {
-			*port = 0;
-			n = sscanf(line, "%d %d %s at %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)", &code, &req, node, host, &cipher, &digest, &maclength, &compression, &options, (unsigned *)&status, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu);
-
-			if(n != 16) {
-				fprintf(stderr, "Unable to parse node dump from tincd.\n");
-				return 1;
-			}
+		if(n != 19) {
+			fprintf(stderr, "Unable to parse node dump from tincd.\n");
+			return 1;
 		}
 
 		if(!strcmp(node, item)) {
@@ -88,13 +91,27 @@ static int info_node(int fd, const char *item) {
 	}
 
 	while(recvline(fd, line, sizeof line)) {
-		if(sscanf(line, "%d %d %s", &code, &req, node) == 2)
+		if(sscanf(line, "%d %d %4095s", &code, &req, node) == 2)
 			break;
 	}
-	
+
 	printf("Node:         %s\n", item);
-	if(*port)
-		printf("Address:      %s port %s\n", host, port);
+	printf("Node ID:      %s\n", id);
+	printf("Address:      %s port %s\n", host, port);
+
+	char timestr[32] = "never";
+	time_t lsc_time = last_state_change;
+
+	if(last_state_change)
+		strftime(timestr, sizeof timestr, "%Y-%m-%d %H:%M:%S", localtime(&lsc_time));
+
+	status = status_union.bits;
+
+	if(status.reachable)
+		printf("Online since: %s\n", timestr);
+	else
+		printf("Last seen:    %s\n", timestr);
+
 	printf("Status:      ");
 	if(status.validkey)
 		printf(" validkey");
@@ -106,7 +123,10 @@ static int info_node(int fd, const char *item) {
 		printf(" indirect");
 	if(status.sptps)
 		printf(" sptps");
+	if(status.udp_confirmed)
+		printf(" udp_confirmed");
 	printf("\n");
+
 	printf("Options:     ");
 	if(options & OPTION_INDIRECT)
 		printf(" indirect");
@@ -119,7 +139,7 @@ static int info_node(int fd, const char *item) {
 	printf("\n");
 	printf("Protocol:     %d.%d\n", PROT_MAJOR, OPTION_VERSION(options));
 	printf("Reachability: ");
-	if(!*port)
+	if(!strcmp(host, "MYSELF"))
 		printf("can reach itself\n");
 	else if(!status.reachable)
 		printf("unreachable\n");
@@ -138,7 +158,7 @@ static int info_node(int fd, const char *item) {
 	printf("Edges:       ");
 	sendline(fd, "%d %d %s", CONTROL, REQ_DUMP_EDGES, item);
 	while(recvline(fd, line, sizeof line)) {
-		int n = sscanf(line, "%d %d %s to %s", &code, &req, from, to);
+		int n = sscanf(line, "%d %d %4095s %4095s", &code, &req, from, to);
 		if(n == 2)
 			break;
 		if(n != 4) {
@@ -154,7 +174,7 @@ static int info_node(int fd, const char *item) {
 	printf("Subnets:     ");
 	sendline(fd, "%d %d %s", CONTROL, REQ_DUMP_SUBNETS, item);
 	while(recvline(fd, line, sizeof line)) {
-		int n = sscanf(line, "%d %d %s owner %s", &code, &req, subnet, from);
+		int n = sscanf(line, "%d %d %4095s %4095s", &code, &req, subnet, from);
 		if(n == 2)
 			break;
 		if(n != 4) {
@@ -189,7 +209,7 @@ static int info_subnet(int fd, const char *item) {
 
 	sendline(fd, "%d %d %s", CONTROL, REQ_DUMP_SUBNETS, item);
 	while(recvline(fd, line, sizeof line)) {
-		int n = sscanf(line, "%d %d %s owner %s", &code, &req, netstr, owner);
+		int n = sscanf(line, "%d %d %4095s %4095s", &code, &req, netstr, owner);
 		if(n == 2)
 			break;