Fix compiler warnings on some BSD variants.

diff --git a/src/info.c b/src/info.c
index 25d51bff219a83f5a563264f1b9b3839f0361361..8e91a227f300a8e3c1caac429a7c71154a8879cd 100644 (file)
--- a/src/info.c
+++ b/src/info.c
@@ -58,11 +58,15 @@ static int info_node(int fd, const char *item) {
        int code, req, cipher, digest, maclength, compression, distance;
        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;
@@ -92,8 +96,12 @@ static int info_node(int fd, const char *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);

diff --git a/src/meta.c b/src/meta.c
index 3bf28093f33b25629e858999d9065c492b905f96..fafba653c4d014f237585d7b704e4e56f642121c 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -201,7 +201,7 @@ bool receive_meta(connection_t *c) {
                                                        logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server");
                                                        return false;
                                                }
-                                               if(tcpbuffer[1] == 0xff) {
+                                               if(tcpbuffer[1] == (char)0xff) {
                                                        logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected: unsuitable authentication method");
                                                        return false;
                                                }