X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Finfo.c;h=b9a6fcf97804ff4cb2cf6019d89b984685d1ea86;hp=93be24e4eaacbe6e938e783fb4a5181b8260be25;hb=34ea20af73a35cd918ce9dc25796bebf9493b49c;hpb=d6388d782ede1bbe49a5c2643362e2e0f383fa89

diff --git a/src/info.c b/src/info.c
index 93be24e4..b9a6fcf9 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-2013 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,13 +24,15 @@
 #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);
 }
 
 char *strip_weight(char *netstr) {
@@ -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,18 +59,22 @@ 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 %s port %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", &code, &req, node, host, port, &cipher, &digest, &maclength, &compression, &options, (unsigned *)&status, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change);
+		int n = sscanf(line, "%d %d %s %s %s port %s %d %d %d %d %x %"PRIx32" %s %s %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 != 18) {
+		if(n != 19) {
 			fprintf(stderr, "Unable to parse node dump from tincd.\n");
 			return 1;
 		}
@@ -87,13 +94,18 @@ static int info_node(int fd, const char *item) {
 		if(sscanf(line, "%d %d %s", &code, &req, node) == 2)
 			break;
 	}
-	
+
 	printf("Node:         %s\n", item);
+	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(&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);
@@ -111,6 +123,8 @@ 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:     ");