X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Finfo.c;h=b55257484b5c9095376a4fba6c069074c888a7ef;hb=3a316823b971396a428f020f401b9fe41252d98d;hp=8e91a227f300a8e3c1caac429a7c71154a8879cd;hpb=d298ebe91c9209d139f38b6de2e42bf7c5bb5899;p=tinc

diff --git a/src/info.c b/src/info.c
index 8e91a227..b5525748 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,6 +24,7 @@
 #include "subnet.h"
 #include "tincctl.h"
 #include "info.h"
+#include "utils.h"
 #include "xalloc.h"
 
 void logger(int level, int priority, const char *format, ...) {
@@ -31,6 +32,7 @@ void logger(int level, int priority, const char *format, ...) {
 	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];
@@ -65,13 +68,13 @@ static int info_node(int fd, const char *item) {
 	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 %"PRIx32" %s %s %d %hd %hd %hd %ld", &code, &req, node, host, port, &cipher, &digest, &maclength, &compression, &options, &status_union.raw, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change);
+	while(recvline(fd, line, sizeof(line))) {
+		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 != 18) {
+		if(n != 19) {
 			fprintf(stderr, "Unable to parse node dump from tincd.\n");
 			return 1;
 		}
@@ -87,19 +90,20 @@ static int info_node(int fd, const char *item) {
 		return 1;
 	}
 
-	while(recvline(fd, line, sizeof line)) {
-		if(sscanf(line, "%d %d %s", &code, &req, node) == 2)
+	while(recvline(fd, line, sizeof(line))) {
+		if(sscanf(line, "%d %d %4095s", &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(&lsc_time));
+		strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S", localtime(&lsc_time));
 
 	status = status_union.bits;
 
@@ -153,8 +157,8 @@ static int info_node(int fd, const char *item) {
 	// List edges
 	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 %s", &code, &req, from, to);
+	while(recvline(fd, line, sizeof(line))) {
+		int n = sscanf(line, "%d %d %4095s %4095s", &code, &req, from, to);
 		if(n == 2)
 			break;
 		if(n != 4) {
@@ -169,8 +173,8 @@ static int info_node(int fd, const char *item) {
 	// List subnets
 	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 %s", &code, &req, subnet, from);
+	while(recvline(fd, line, sizeof(line))) {
+		int n = sscanf(line, "%d %d %4095s %4095s", &code, &req, subnet, from);
 		if(n == 2)
 			break;
 		if(n != 4) {
@@ -204,8 +208,8 @@ static int info_subnet(int fd, const char *item) {
 	int code, req;
 
 	sendline(fd, "%d %d %s", CONTROL, REQ_DUMP_SUBNETS, item);
-	while(recvline(fd, line, sizeof line)) {
-		int n = sscanf(line, "%d %d %s %s", &code, &req, netstr, owner);
+	while(recvline(fd, line, sizeof(line))) {
+		int n = sscanf(line, "%d %d %4095s %4095s", &code, &req, netstr, owner);
 		if(n == 2)
 			break;
 
@@ -229,7 +233,7 @@ static int info_subnet(int fd, const char *item) {
 			} else {
 				if(find.net.ipv4.prefixlength != subnet.net.ipv4.prefixlength)
 					continue;
-				if(memcmp(&find.net.ipv4.address, &subnet.net.ipv4.address, sizeof subnet.net.ipv4))
+				if(memcmp(&find.net.ipv4.address, &subnet.net.ipv4.address, sizeof(subnet.net.ipv4)))
 					continue;
 			}
 		} else if(find.type == SUBNET_IPV6) {
@@ -239,11 +243,11 @@ static int info_subnet(int fd, const char *item) {
 			} else {
 				if(find.net.ipv6.prefixlength != subnet.net.ipv6.prefixlength)
 					continue;
-				if(memcmp(&find.net.ipv6.address, &subnet.net.ipv6.address, sizeof subnet.net.ipv6))
+				if(memcmp(&find.net.ipv6.address, &subnet.net.ipv6.address, sizeof(subnet.net.ipv6)))
 					continue;
 			}
 		} if(find.type == SUBNET_MAC) {
-			if(memcmp(&find.net.mac.address, &subnet.net.mac.address, sizeof subnet.net.mac))
+			if(memcmp(&find.net.mac.address, &subnet.net.mac.address, sizeof(subnet.net.mac)))
 				continue;
 		}