]> The Tcpdump Group git mirrors - tcpdump/commitdiff
Use EXTRACT_IPV4_TO_NETWORK_ORDER() when checking an address against 0.
authorGuy Harris <[email protected]>
Tue, 30 Jan 2018 22:42:40 +0000 (14:42 -0800)
committerGuy Harris <[email protected]>
Tue, 30 Jan 2018 22:42:40 +0000 (14:42 -0800)
It may do less work than EXTRACT_IPV4_TO_HOST_ORDER(), and the byte
order doesn't matter when comparing against 0.

print-ospf.c

index e36f81841ee04c57327bc3686a70e965218b8129..b177d1d71410d1790f125f464ed15a2b064d2124 100644 (file)
@@ -761,11 +761,11 @@ ospf_print_lsa(netdissect_options *ndo,
                                ND_PRINT(" %u", (ul & ASLA_MASK_METRIC));
 
                        ND_TCHECK_4(almp->asla_forward);
-                       if (EXTRACT_IPV4_TO_HOST_ORDER(almp->asla_forward) != 0) {
+                       if (EXTRACT_IPV4_TO_NETWORK_ORDER(almp->asla_forward) != 0) {
                                ND_PRINT(", forward %s", ipaddr_string(ndo, almp->asla_forward));
                        }
                        ND_TCHECK_4(almp->asla_tag);
-                       if (EXTRACT_IPV4_TO_HOST_ORDER(almp->asla_tag) != 0) {
+                       if (EXTRACT_IPV4_TO_NETWORK_ORDER(almp->asla_tag) != 0) {
                                ND_PRINT(", tag %s", ipaddr_string(ndo, almp->asla_tag));
                        }
                        ++almp;
@@ -1147,7 +1147,7 @@ ospf_print(netdissect_options *ndo,
        ND_PRINT("\n\tRouter-ID %s", ipaddr_string(ndo, op->ospf_routerid));
 
        ND_TCHECK_4(op->ospf_areaid);
-       if (EXTRACT_IPV4_TO_HOST_ORDER(op->ospf_areaid) != 0)
+       if (EXTRACT_IPV4_TO_NETWORK_ORDER(op->ospf_areaid) != 0)
                ND_PRINT(", Area %s", ipaddr_string(ndo, op->ospf_areaid));
        else
                ND_PRINT(", Backbone Area");