Fix compiler warnings on some BSD variants.

[tinc] / src / info.c

diff --git a/src/info.c b/src/info.c
index ed4dc82..8e91a22 100644 (file)
--- a/src/info.c
+++ b/src/info.c
@@ -28,9 +28,9 @@
 
 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);
 }
 
 char *strip_weight(char *netstr) {
@@ -56,13 +56,17 @@ 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 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);
 
                if(n == 2)
                        break;
@@ -87,13 +91,17 @@ 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("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);