From: volth Date: Wed, 13 Jun 2018 18:10:47 +0000 (+0000) Subject: minor X-Git-Tag: release-1.1pre17~15^2 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=70e1e467f93f885da3e49289e96757d5cd2ae5ba;p=tinc minor --- diff --git a/src/info.c b/src/info.c index 9ac7bbca..4ca67ec4 100644 --- a/src/info.c +++ b/src/info.c @@ -70,11 +70,11 @@ static int info_node(int fd, const char *item) { } status_union; node_status_t status; long int last_state_change; - long int udp_ping_rtt; + int udp_ping_rtt; uint64_t in_packets, in_bytes, out_packets, out_bytes; 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 %ld %lu %lu %lu %lu", &code, &req, node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status_union.raw, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change, &udp_ping_rtt, &in_packets, &in_bytes, &out_packets, &out_bytes); + int n = sscanf(line, "%d %d %4095s %4095s %4095s port %4095s %d %d %d %d %x %"PRIx32" %4095s %4095s %d %hd %hd %hd %ld %d %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, &code, &req, node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status_union.raw, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change, &udp_ping_rtt, &in_packets, &in_bytes, &out_packets, &out_bytes); if(n == 2) { break; @@ -146,7 +146,7 @@ static int info_node(int fd, const char *item) { if(status.udp_confirmed) { printf(" udp_confirmed"); if(udp_ping_rtt != -1) - printf(" (rtt %ld.%03ld)", udp_ping_rtt/1000, udp_ping_rtt%1000); + printf(" (rtt %ld.%03ld)", udp_ping_rtt / 1000, udp_ping_rtt % 1000); } printf("\n"); @@ -189,8 +189,8 @@ static int info_node(int fd, const char *item) { printf("none, forwarded via %s\n", nexthop); } - printf("RX: %lu packets %lu bytes\n", in_packets, in_bytes); - printf("TX: %lu packets %lu bytes\n", out_packets, out_bytes); + printf("RX: %"PRIu64" packets %"PRIu64" bytes\n", in_packets, in_bytes); + printf("TX: %"PRIu64" packets %"PRIu64" bytes\n", out_packets, out_bytes); // List edges printf("Edges: "); diff --git a/src/net_packet.c b/src/net_packet.c index 6ce6431d..ee2b316b 100644 --- a/src/net_packet.c +++ b/src/net_packet.c @@ -156,8 +156,8 @@ static void udp_probe_h(node_t *n, vpn_packet_t *packet, length_t len) { gettimeofday(&now, NULL); struct timeval rtt; timersub(&now, &n->udp_ping_sent, &rtt); - n->udp_ping_rtt = rtt.tv_sec*1000000L + rtt.tv_usec; - logger(DEBUG_TRAFFIC, LOG_INFO, "Got type %d UDP probe reply %d from %s (%s) rtt=%ld.%03ld", DATA(packet)[0], len, n->name, n->hostname, n->udp_ping_rtt/1000, n->udp_ping_rtt%1000); + n->udp_ping_rtt = rtt.tv_sec*1000000 + rtt.tv_usec; + logger(DEBUG_TRAFFIC, LOG_INFO, "Got type %d UDP probe reply %d from %s (%s) rtt=%d.%03d", DATA(packet)[0], len, n->name, n->hostname, n->udp_ping_rtt / 1000, n->udp_ping_rtt % 1000); } else { logger(DEBUG_TRAFFIC, LOG_INFO, "Got type %d UDP probe reply %d from %s (%s)", DATA(packet)[0], len, n->name, n->hostname); } diff --git a/src/node.c b/src/node.c index 6a5b747e..4ec5d353 100644 --- a/src/node.c +++ b/src/node.c @@ -212,7 +212,7 @@ bool dump_nodes(connection_t *c) { } id[sizeof(id) - 1] = 0; - send_request(c, "%d %d %s %s %s %d %d %d %d %x %x %s %s %d %d %d %d %ld %ld %lu %lu %lu %lu", CONTROL, REQ_DUMP_NODES, + send_request(c, "%d %d %s %s %s %d %d %d %d %x %x %s %s %d %d %d %d %ld %d %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, CONTROL, REQ_DUMP_NODES, n->name, id, n->hostname ? : "unknown port unknown", #ifdef DISABLE_LEGACY 0, 0, 0, @@ -221,7 +221,7 @@ bool dump_nodes(connection_t *c) { #endif n->outcompression, n->options, bitfield_to_int(&n->status, sizeof(n->status)), n->nexthop ? n->nexthop->name : "-", n->via ? n->via->name ? : "-" : "-", n->distance, - n->mtu, n->minmtu, n->maxmtu, (long)n->last_state_change, (long)n->udp_ping_rtt, + n->mtu, n->minmtu, n->maxmtu, (long)n->last_state_change, n->udp_ping_rtt, n->in_packets, n->in_bytes, n->out_packets, n->out_bytes); } diff --git a/src/node.h b/src/node.h index 0cdac3fa..3daffd4a 100644 --- a/src/node.h +++ b/src/node.h @@ -92,7 +92,7 @@ typedef struct node_t { struct timeval udp_reply_sent; /* Last time a (gratuitous) UDP probe reply was sent */ struct timeval udp_ping_sent; /* Last time a UDP probe was sent */ - long int udp_ping_rtt; /* Round trip time of UDP ping (in microseconds) */ + int udp_ping_rtt; /* Round trip time of UDP ping (in microseconds; or -1 if !status.udp_confirmed) */ timeout_t udp_ping_timeout; /* Ping timeout event */ struct timeval mtu_ping_sent; /* Last time a MTU probe was sent */ diff --git a/src/tincctl.c b/src/tincctl.c index af54aefb..d8df67c9 100644 --- a/src/tincctl.c +++ b/src/tincctl.c @@ -1298,12 +1298,12 @@ static int cmd_dump(int argc, char *argv[]) { unsigned int options, status_int; node_status_t status; long int last_state_change; - long int udp_ping_rtt; + int udp_ping_rtt; uint64_t in_packets, in_bytes, out_packets, out_bytes; switch(req) { case REQ_DUMP_NODES: { - int n = sscanf(line, "%*d %*d %4095s %4095s %4095s port %4095s %d %d %d %d %x %x %4095s %4095s %d %hd %hd %hd %ld %ld %lu %lu %lu %lu", node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change, &udp_ping_rtt, &in_packets, &in_bytes, &out_packets, &out_bytes); + int n = sscanf(line, "%*d %*d %4095s %4095s %4095s port %4095s %d %d %d %d %x %x %4095s %4095s %d %hd %hd %hd %ld %d %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change, &udp_ping_rtt, &in_packets, &in_bytes, &out_packets, &out_bytes); if(n != 22) { fprintf(stderr, "Unable to parse node dump from tincd: %s\n", line); @@ -1333,10 +1333,10 @@ static int cmd_dump(int argc, char *argv[]) { continue; } - printf("%s id %s at %s port %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d) rx %lu %lu tx %lu %lu", + printf("%s id %s at %s port %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d) rx %"PRIu64" %"PRIu64" tx %"PRIu64" %"PRIu64, node, id, host, port, cipher, digest, maclength, compression, options, status_int, nexthop, via, distance, pmtu, minmtu, maxmtu, in_packets, in_bytes, out_packets, out_bytes); if (udp_ping_rtt != -1) - printf(" rtt %ld.%03ld", udp_ping_rtt/1000, udp_ping_rtt%1000); + printf(" rtt %d.%03d", udp_ping_rtt / 1000, udp_ping_rtt % 1000); printf("\n"); } }