X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/c0679b38a3ee4ba138500fce5f1631989492f37e..d7b497cac78b6e22a66a6bae9bdec60a8044f67a:/print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index fc296b81..237c36d4 100644
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -76,8 +76,8 @@ ip6_finddst(netdissect_options *ndo, struct in6_addr *dst,
 			 * the header, in units of 8 octets, excluding
 			 * the first 8 octets.
 			 */
-			ND_TCHECK2(*cp, 2);
-			advance = (EXTRACT_8BITS(cp + 1) + 1) << 3;
+			ND_TCHECK_2(cp);
+			advance = (EXTRACT_U_1(cp + 1) + 1) << 3;
 			nh = *cp;
 			break;
 
@@ -87,7 +87,7 @@ ip6_finddst(netdissect_options *ndo, struct in6_addr *dst,
 			 * marked as reserved, and the header is always
 			 * the same size.
 			 */
-			ND_TCHECK2(*cp, 1);
+			ND_TCHECK_1(cp);
 			advance = sizeof(struct ip6_frag);
 			nh = *cp;
 			break;
@@ -239,14 +239,14 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
           return;
 	}
 
-	payload_len = EXTRACT_BE_16BITS(&ip6->ip6_plen);
+	payload_len = EXTRACT_BE_U_2(&ip6->ip6_plen);
 	len = payload_len + sizeof(struct ip6_hdr);
 	if (length < len)
 		ND_PRINT((ndo, "truncated-ip6 - %u bytes missing!",
 			len - length));
 
         if (ndo->ndo_vflag) {
-            flow = EXTRACT_BE_32BITS(&ip6->ip6_flow);
+            flow = EXTRACT_BE_U_4(&ip6->ip6_flow);
             ND_PRINT((ndo, "("));
 #if 0
             /* rfc1883 */
@@ -297,19 +297,19 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
 			advance = hbhopt_print(ndo, cp);
 			if (advance < 0)
 				return;
-			nh = EXTRACT_8BITS(cp);
+			nh = EXTRACT_U_1(cp);
 			break;
 		case IPPROTO_DSTOPTS:
 			advance = dstopt_print(ndo, cp);
 			if (advance < 0)
 				return;
-			nh = EXTRACT_8BITS(cp);
+			nh = EXTRACT_U_1(cp);
 			break;
 		case IPPROTO_FRAGMENT:
 			advance = frag6_print(ndo, cp, (const u_char *)ip6);
 			if (advance < 0 || ndo->ndo_snapend <= cp + advance)
 				return;
-			nh = EXTRACT_8BITS(cp);
+			nh = EXTRACT_U_1(cp);
 			fragmented = 1;
 			break;
 
@@ -326,14 +326,14 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
 			advance = mobility_print(ndo, cp, (const u_char *)ip6);
 			if (advance < 0)
 				return;
-			nh = EXTRACT_8BITS(cp);
+			nh = EXTRACT_U_1(cp);
 			return;
 		case IPPROTO_ROUTING:
 			ND_TCHECK(*cp);
 			advance = rt6_print(ndo, cp, (const u_char *)ip6);
 			if (advance < 0)
 				return;
-			nh = EXTRACT_8BITS(cp);
+			nh = EXTRACT_U_1(cp);
 			break;
 		case IPPROTO_SCTP:
 			sctp_print(ndo, cp, (const u_char *)ip6, len);
@@ -354,7 +354,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
 			advance = ah_print(ndo, cp);
 			if (advance < 0)
 				return;
-			nh = EXTRACT_8BITS(cp);
+			nh = EXTRACT_U_1(cp);
 			break;
 		case IPPROTO_ESP:
 		    {