From: Guy Harris <guy@alum.mit.edu>
Date: Sun, 31 Dec 2017 01:38:58 +0000 (-0800)
Subject: Use nd_ types.
X-Git-Tag: tcpdump-4.99-bp~1536
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/ddc9d5bcaee247fbe928bccea800c02994a657c4

Use nd_ types.
---

diff --git a/print-msnlb.c b/print-msnlb.c
index 2352ba38..a7bee091 100644
--- a/print-msnlb.c
+++ b/print-msnlb.c
@@ -39,11 +39,11 @@
 #include "extract.h"
 
 struct msnlb_heartbeat_pkt {
-	uint32_t unknown1;
-	uint32_t unknown2;
-	uint32_t host_prio;	/* little-endian */
-	uint32_t virtual_ip;
-	uint32_t host_ip;
+	nd_byte     unknown1[4];
+	nd_byte     unknown2[4];
+	nd_uint32_t host_prio;	/* little-endian */
+	nd_ipv4     virtual_ip;
+	nd_ipv4     host_ip;
 	/* the protocol is undocumented so we ignore the rest */
 };
 
@@ -56,7 +56,7 @@ msnlb_print(netdissect_options *ndo, const u_char *bp)
 	ND_TCHECK(*hb);
 
 	ND_PRINT((ndo, "MS NLB heartbeat, host priority: %u,",
-		EXTRACT_LE_U_4(&(hb->host_prio))));
+		EXTRACT_LE_U_4((hb->host_prio))));
 	ND_PRINT((ndo, " cluster IP: %s,", ipaddr_string(ndo, &(hb->virtual_ip))));
 	ND_PRINT((ndo, " host IP: %s", ipaddr_string(ndo, &(hb->host_ip))));
 	return;