From: Guy Harris <guy@alum.mit.edu>
Date: Tue, 30 Jan 2018 22:42:40 +0000 (-0800)
Subject: Use EXTRACT_IPV4_TO_NETWORK_ORDER() when checking an address against 0.
X-Git-Tag: tcpdump-4.99-bp~1306
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/7f952dfbb3ffd7fa937af4c97f5e58cdf03e4aab

Use EXTRACT_IPV4_TO_NETWORK_ORDER() when checking an address against 0.

It may do less work than EXTRACT_IPV4_TO_HOST_ORDER(), and the byte
order doesn't matter when comparing against 0.
---

diff --git a/print-ospf.c b/print-ospf.c
index e36f8184..b177d1d7 100644
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -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");