X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/dbcba20b5eaeb49a2027130283e617ea3c755a67..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-mobility.c

diff --git a/print-mobility.c b/print-mobility.c
index a3066380..6ad7c718 100644
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -118,20 +118,20 @@ mobility_opt_print(netdissect_options *ndo,
 	unsigned i, optlen;
 
 	for (i = 0; i < len; i += optlen) {
-		ND_TCHECK(bp[i]);
-		if (bp[i] == IP6MOPT_PAD1)
+		ND_TCHECK_1(bp + i);
+		if (EXTRACT_U_1(bp + i) == IP6MOPT_PAD1)
 			optlen = 1;
 		else {
 			if (i + 1 < len) {
-				ND_TCHECK(bp[i + 1]);
-				optlen = bp[i + 1] + 2;
+				ND_TCHECK_1(bp + i + 1);
+				optlen = EXTRACT_U_1(bp + i + 1) + 2;
 			}
 			else
 				goto trunc;
 		}
 		if (i + optlen > len)
 			goto trunc;
-		ND_TCHECK(bp[i + optlen]);
+		ND_TCHECK_1(bp + i + optlen);
 
 		switch (EXTRACT_U_1(bp + i)) {
 		case IP6MOPT_PAD1:
@@ -282,15 +282,15 @@ mobility_print(netdissect_options *ndo,
 		ND_PRINT((ndo, " seq#=%u", EXTRACT_BE_U_2(&mh->ip6m_data16[0])));
 		hlen = IP6M_MINLEN;
 		ND_TCHECK_2(bp + hlen);
-		if (bp[hlen] & 0xf0) {
+		if (EXTRACT_U_1(bp + hlen) & 0xf0) {
 			ND_PRINT((ndo, " "));
-			if (bp[hlen] & 0x80)
+			if (EXTRACT_U_1(bp + hlen) & 0x80)
 				ND_PRINT((ndo, "A"));
-			if (bp[hlen] & 0x40)
+			if (EXTRACT_U_1(bp + hlen) & 0x40)
 				ND_PRINT((ndo, "H"));
-			if (bp[hlen] & 0x20)
+			if (EXTRACT_U_1(bp + hlen) & 0x20)
 				ND_PRINT((ndo, "L"));
-			if (bp[hlen] & 0x10)
+			if (EXTRACT_U_1(bp + hlen) & 0x10)
 				ND_PRINT((ndo, "K"));
 		}
 		/* Reserved (4bits) */
@@ -333,7 +333,7 @@ mobility_print(netdissect_options *ndo,
 		break;
 	}
 	if (ndo->ndo_vflag)
-		if (mobility_opt_print(ndo, &bp[hlen], mhlen - hlen))
+		if (mobility_opt_print(ndo, bp + hlen, mhlen - hlen))
 			goto trunc;
 
 	return(mhlen);