Introduce node IDs.

[tinc] / src / info.c

diff --git a/src/info.c b/src/info.c
index c9b0094..b9a6fcf 100644 (file)
--- a/src/info.c
+++ b/src/info.c
@@ -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 %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;
                }
@@ -95,6 +96,7 @@ static int info_node(int fd, const char *item) {
        }
 
        printf("Node:         %s\n", item);
+       printf("Node ID:      %s\n", id);
        printf("Address:      %s port %s\n", host, port);
 
        char timestr[32] = "never";