Remove unnecessary status bitfield conversions.

[tinc] / src / tincctl.c

diff --git a/src/tincctl.c b/src/tincctl.c
index 215d757..a3978bc 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1244,7 +1244,6 @@ static int cmd_dump(int argc, char *argv[]) {
                int cipher, digest, maclength, compression, distance, socket, weight;
                short int pmtu, minmtu, maxmtu;
                unsigned int options;
-               uint32_t status_int;
                node_status_t status;
                long int last_state_change;
                int udp_ping_rtt;
@@ -1252,15 +1251,13 @@ static int cmd_dump(int argc, char *argv[]) {
 
                switch(req) {
                case REQ_DUMP_NODES: {
-                       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, 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 %"PRIx32" %4095s %4095s %d %hd %hd %hd %ld %d %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status.value, 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);
                                return 1;
                        }
 
-                       memcpy(&status, &status_int, sizeof(status));
-
                        if(do_graph) {
                                const char *color = "black";
 
@@ -1283,7 +1280,7 @@ static int cmd_dump(int argc, char *argv[]) {
                                }
 
                                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);
+                                      node, id, host, port, cipher, digest, maclength, compression, options, status.value, nexthop, via, distance, pmtu, minmtu, maxmtu, in_packets, in_bytes, out_packets, out_bytes);
 
                                if(udp_ping_rtt != -1) {
                                        printf(" rtt %d.%03d", udp_ping_rtt / 1000, udp_ping_rtt % 1000);
@@ -1329,14 +1326,14 @@ static int cmd_dump(int argc, char *argv[]) {
                break;
 
                case REQ_DUMP_CONNECTIONS: {
-                       int n = sscanf(line, "%*d %*d %4095s %4095s port %4095s %x %d %x", node, host, port, &options, &socket, &status_int);
+                       int n = sscanf(line, "%*d %*d %4095s %4095s port %4095s %x %d %x", node, host, port, &options, &socket, &status.value);
 
                        if(n != 6) {
                                fprintf(stderr, "Unable to parse connection dump from tincd.\n");
                                return 1;
                        }
 
-                       printf("%s at %s port %s options %x socket %d status %x\n", node, host, port, options, socket, status_int);
+                       printf("%s at %s port %s options %x socket %d status %x\n", node, host, port, options, socket, status.value);
                }
                break;