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

diff --git a/src/info.c b/src/info.c
index c9b00946..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-2013 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
@@ -50,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];
@@ -68,12 +69,12 @@ static int info_node(int fd, const char *item) {
 	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);
+		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;
 		}
@@ -90,11 +91,12 @@ 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);
+	printf("Node ID:      %s\n", id);
 	printf("Address:      %s port %s\n", host, port);
 
 	char timestr[32] = "never";
@@ -156,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 %s", &code, &req, from, to);
+		int n = sscanf(line, "%d %d %4095s %4095s", &code, &req, from, to);
 		if(n == 2)
 			break;
 		if(n != 4) {
@@ -172,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 %s", &code, &req, subnet, from);
+		int n = sscanf(line, "%d %d %4095s %4095s", &code, &req, subnet, from);
 		if(n == 2)
 			break;
 		if(n != 4) {
@@ -207,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 %s", &code, &req, netstr, owner);
+		int n = sscanf(line, "%d %d %4095s %4095s", &code, &req, netstr, owner);
 		if(n == 2)
 			break;