X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Finfo.c;h=d0db89a7ed04d868eeecade35c526f88bf8c0357;hb=de8e6bf452227094a8aadd32dd5ea0d94d4b5db9;hp=25d51bff219a83f5a563264f1b9b3839f0361361;hpb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;p=tinc diff --git a/src/info.c b/src/info.c index 25d51bff..d0db89a7 100644 --- a/src/info.c +++ b/src/info.c @@ -31,6 +31,7 @@ void logger(int level, int priority, const char *format, ...) { va_start(ap, format); vfprintf(stderr, format, ap); va_end(ap); + fputc('\n', stderr); } char *strip_weight(char *netstr) { @@ -58,11 +59,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 +97,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);