From: Guy Harris <guy@alum.mit.edu>
Date: Sat, 30 Dec 2017 02:31:23 +0000 (-0800)
Subject: Use nd_ types, add EXTRACT_ calls.
X-Git-Tag: tcpdump-4.99-bp~1573
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/2ea61a7940370d32a96478fb040e3e9487c2d48e

Use nd_ types, add EXTRACT_ calls.
---

diff --git a/print-arcnet.c b/print-arcnet.c
index 36801bfa..4dccf4a9 100644
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -41,22 +41,22 @@
  * as given to interface code.
  */
 struct	arc_header {
-	uint8_t  arc_shost;
-	uint8_t  arc_dhost;
-	uint8_t  arc_type;
+	nd_uint8_t  arc_shost;
+	nd_uint8_t  arc_dhost;
+	nd_uint8_t  arc_type;
 	/*
 	 * only present for newstyle encoding with LL fragmentation.
 	 * Don't use sizeof(anything), use ARC_HDR{,NEW}LEN instead.
 	 */
-	uint8_t  arc_flag;
-	uint16_t arc_seqid;
+	nd_uint8_t  arc_flag;
+	nd_uint16_t arc_seqid;
 
 	/*
 	 * only present in exception packets (arc_flag == 0xff)
 	 */
-	uint8_t  arc_type2;	/* same as arc_type */
-	uint8_t  arc_flag2;	/* real flag value */
-	uint16_t arc_seqid2;	/* real seqid value */
+	nd_uint8_t  arc_type2;	/* same as arc_type */
+	nd_uint8_t  arc_flag2;	/* real flag value */
+	nd_uint16_t arc_seqid2;	/* real seqid value */
 };
 
 #define	ARC_HDRLEN		3
@@ -85,17 +85,17 @@ struct	arc_header {
  * never presents packets that look like exception frames.
  */
 struct	arc_linux_header {
-	uint8_t  arc_shost;
-	uint8_t  arc_dhost;
-	uint16_t arc_offset;
-	uint8_t  arc_type;
+	nd_uint8_t  arc_shost;
+	nd_uint8_t  arc_dhost;
+	nd_uint16_t arc_offset;
+	nd_uint8_t  arc_type;
 	/*
 	 * only present for newstyle encoding with LL fragmentation.
 	 * Don't use sizeof(anything), use ARC_LINUX_HDR{,NEW}LEN
 	 * instead.
 	 */
-	uint8_t  arc_flag;
-	uint16_t arc_seqid;
+	nd_uint8_t  arc_flag;
+	nd_uint16_t arc_seqid;
 };
 
 #define	ARC_LINUX_HDRLEN	5
@@ -130,38 +130,46 @@ arcnet_print(netdissect_options *ndo, const u_char *bp, u_int length, int phds,
 
 
 	if (ndo->ndo_qflag) {
-		ND_PRINT((ndo, "%02x %02x %d: ",
-			     ap->arc_shost,
-			     ap->arc_dhost,
+		ND_PRINT((ndo, "%02x %02x %u: ",
+			     EXTRACT_U_1(ap->arc_shost),
+			     EXTRACT_U_1(ap->arc_dhost),
 			     length));
 		return;
 	}
 
-	arctypename = tok2str(arctypemap, "%02x", ap->arc_type);
+	arctypename = tok2str(arctypemap, "%02x", EXTRACT_U_1(ap->arc_type));
 
 	if (!phds) {
 		ND_PRINT((ndo, "%02x %02x %s %d: ",
-			     ap->arc_shost, ap->arc_dhost, arctypename,
+			     EXTRACT_U_1(ap->arc_shost),
+			     EXTRACT_U_1(ap->arc_dhost),
+			     arctypename,
 			     length));
-			     return;
+		return;
 	}
 
 	if (flag == 0) {
 		ND_PRINT((ndo, "%02x %02x %s seqid %04x %d: ",
-			ap->arc_shost, ap->arc_dhost, arctypename, seqid,
+			EXTRACT_U_1(ap->arc_shost),
+			EXTRACT_U_1(ap->arc_dhost),
+			arctypename, seqid,
 			length));
-			return;
+		return;
 	}
 
 	if (flag & 1)
 		ND_PRINT((ndo, "%02x %02x %s seqid %04x "
 			"(first of %d fragments) %d: ",
-			ap->arc_shost, ap->arc_dhost, arctypename, seqid,
+			EXTRACT_U_1(ap->arc_shost),
+			EXTRACT_U_1(ap->arc_dhost),
+			arctypename, seqid,
 			(flag + 3) / 2, length));
 	else
 		ND_PRINT((ndo, "%02x %02x %s seqid %04x "
 			"(fragment %d) %d: ",
-			ap->arc_shost, ap->arc_dhost, arctypename, seqid,
+			EXTRACT_U_1(ap->arc_shost),
+			EXTRACT_U_1(ap->arc_dhost),
+			arctypename, seqid,
 			flag/2 + 1, length));
 }
 
@@ -188,7 +196,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
 	}
 
 	ap = (const struct arc_header *)p;
-	arc_type = ap->arc_type;
+	arc_type = EXTRACT_U_1(ap->arc_type);
 
 	switch (arc_type) {
 	default:
@@ -209,18 +217,18 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
 			return (caplen);
 		}
 
-		if (ap->arc_flag == 0xff) {
+		flag = EXTRACT_U_1(ap->arc_flag);
+		if (flag == 0xff) {
 			if (caplen < ARC_HDRNEWLEN_EXC || length < ARC_HDRNEWLEN_EXC) {
 				arcnet_print(ndo, p, length, 0, 0, 0);
 				ND_PRINT((ndo, "[|phds extended]"));
 				return (caplen);
 			}
-			flag = ap->arc_flag2;
-			seqid = EXTRACT_BE_U_2(&ap->arc_seqid2);
+			flag = EXTRACT_U_1(ap->arc_flag2);
+			seqid = EXTRACT_BE_U_2(ap->arc_seqid2);
 			archdrlen = ARC_HDRNEWLEN_EXC;
 		} else {
-			flag = ap->arc_flag;
-			seqid = EXTRACT_BE_U_2(&ap->arc_seqid);
+			seqid = EXTRACT_BE_U_2(ap->arc_seqid);
 			archdrlen = ARC_HDRNEWLEN;
 		}
 	}
@@ -275,7 +283,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
 	}
 
 	ap = (const struct arc_linux_header *)p;
-	arc_type = ap->arc_type;
+	arc_type = EXTRACT_U_1(ap->arc_type);
 
 	switch (arc_type) {
 	default: