From d298ebe91c9209d139f38b6de2e42bf7c5bb5899 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Wed, 20 Feb 2013 15:35:08 +0100 Subject: [PATCH] Fix compiler warnings on some BSD variants. --- src/info.c | 12 ++++++++++-- src/meta.c | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/info.c b/src/info.c index 25d51bf..8e91a22 100644 --- 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 3bf2809..fafba65 100644 --- 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; } -- 2.25.1