Convert sizeof foo to sizeof(foo).

[tinc] / src / info.c

diff --git a/src/info.c b/src/info.c
index ee60a3f..b552574 100644 (file)
--- 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,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,25 +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) %ld", &code, &req, node, host, port, &cipher, &digest, &maclength, &compression, &options, (unsigned *)&status, 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) {
-                       *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) %ld", &code, &req, node, host, &cipher, &digest, &maclength, &compression, &options, (unsigned *)&status, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change);
-
-                       if(n != 17) {
-                               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,18 +90,22 @@ 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);
-       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(&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);
@@ -117,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:     ");
@@ -149,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 to %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) {
@@ -165,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 owner %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) {
@@ -200,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 owner %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;
 
@@ -225,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) {
@@ -235,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;
                }