X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/8dca25d26c7ca2caf6138267f6f17111212c156e..de0c7fc746c37eb83e15a6890d30dc6f608e9d76:/print-isakmp.c

diff --git a/print-isakmp.c b/print-isakmp.c
index 04374b0b..8244ac2d 100644
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -922,25 +922,25 @@ ikev1_attrmap_print(netdissect_options *ndo,
 	if (p[0] & 0x80)
 		totlen = 4;
 	else {
-		ND_TCHECK_16BITS(&p[2]);
-		totlen = 4 + EXTRACT_16BITS(&p[2]);
+		ND_TCHECK_2(p + 2);
+		totlen = 4 + EXTRACT_BE_U_2(p + 2);
 	}
 	if (ep2 < p + totlen) {
 		ND_PRINT((ndo,"[|attr]"));
 		return ep2 + 1;
 	}
 
-	ND_TCHECK_16BITS(&p[0]);
+	ND_TCHECK_2(p);
 	ND_PRINT((ndo,"("));
-	t = EXTRACT_16BITS(&p[0]) & 0x7fff;
+	t = EXTRACT_BE_U_2(p) & 0x7fff;
 	if (map && t < nmap && map[t].type)
 		ND_PRINT((ndo,"type=%s ", map[t].type));
 	else
 		ND_PRINT((ndo,"type=#%d ", t));
 	if (p[0] & 0x80) {
 		ND_PRINT((ndo,"value="));
-		ND_TCHECK_16BITS(&p[2]);
-		v = EXTRACT_16BITS(&p[2]);
+		ND_TCHECK_2(p + 2);
+		v = EXTRACT_BE_U_2(p + 2);
 		if (map && t < nmap && v < map[t].nvalue && map[t].value[v])
 			ND_PRINT((ndo,"%s", map[t].value[v]));
 		else {
@@ -973,17 +973,17 @@ ikev1_attr_print(netdissect_options *ndo, const u_char *p, const u_char *ep2)
 	if (p[0] & 0x80)
 		totlen = 4;
 	else {
-		ND_TCHECK_16BITS(&p[2]);
-		totlen = 4 + EXTRACT_16BITS(&p[2]);
+		ND_TCHECK_2(p + 2);
+		totlen = 4 + EXTRACT_BE_U_2(p + 2);
 	}
 	if (ep2 < p + totlen) {
 		ND_PRINT((ndo,"[|attr]"));
 		return ep2 + 1;
 	}
 
-	ND_TCHECK_16BITS(&p[0]);
+	ND_TCHECK_2(p);
 	ND_PRINT((ndo,"("));
-	t = EXTRACT_16BITS(&p[0]) & 0x7fff;
+	t = EXTRACT_BE_U_2(p) & 0x7fff;
 	ND_PRINT((ndo,"type=#%d ", t));
 	if (p[0] & 0x80) {
 		ND_PRINT((ndo,"value="));
@@ -1421,7 +1421,8 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,
 				mask = data + sizeof(struct in_addr);
 				ND_PRINT((ndo," len=%d %s/%u.%u.%u.%u", len,
 					  ipaddr_string(ndo, data),
-					  mask[0], mask[1], mask[2], mask[3]));
+					  EXTRACT_U_1(mask), EXTRACT_U_1(mask + 1),
+					  EXTRACT_U_1(mask + 2), EXTRACT_U_1(mask + 3)));
 			}
 			len = 0;
 			break;
@@ -1443,10 +1444,10 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,
 				/*XXX*/
 				ND_PRINT((ndo," len=%d %s/0x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", len,
 					  ip6addr_string(ndo, data),
-					  mask[0], mask[1], mask[2], mask[3],
-					  mask[4], mask[5], mask[6], mask[7],
-					  mask[8], mask[9], mask[10], mask[11],
-					  mask[12], mask[13], mask[14], mask[15]));
+					  EXTRACT_U_1(mask), EXTRACT_U_1(mask + 1), EXTRACT_U_1(mask + 2), EXTRACT_U_1(mask + 3),
+					  EXTRACT_U_1(mask + 4), EXTRACT_U_1(mask + 5), EXTRACT_U_1(mask + 6), EXTRACT_U_1(mask + 7),
+					  EXTRACT_U_1(mask + 8), EXTRACT_U_1(mask + 9), EXTRACT_U_1(mask + 10), EXTRACT_U_1(mask + 11),
+					  EXTRACT_U_1(mask + 12), EXTRACT_U_1(mask + 13), EXTRACT_U_1(mask + 14), EXTRACT_U_1(mask + 15)));
 			}
 			len = 0;
 			break;
@@ -1770,7 +1771,7 @@ ikev1_n_print(netdissect_options *ndo, u_char tpay _U_,
 		case IPSECDOI_NTYPE_REPLAY_STATUS:
 			ND_PRINT((ndo," status=("));
 			ND_PRINT((ndo,"replay detection %sabled",
-				  EXTRACT_32BITS(cp) ? "en" : "dis"));
+				  EXTRACT_BE_U_4(cp) ? "en" : "dis"));
 			ND_PRINT((ndo,")"));
 			break;
 		default:
@@ -2603,7 +2604,7 @@ ikev2_vid_print(netdissect_options *ndo, u_char tpay,
 	len = ntohs(e.len) - 4;
 	ND_TCHECK2(*vid, len);
 	for(i=0; i<len; i++) {
-		if(ND_ISPRINT(vid[i])) ND_PRINT((ndo, "%c", vid[i]));
+		if(ND_ISPRINT(vid[i])) ND_PRINT((ndo, "%c", EXTRACT_U_1(vid + i)));
 		else ND_PRINT((ndo, "."));
 	}
 	if (2 < ndo->ndo_vflag && 4 < len) {
@@ -2822,7 +2823,7 @@ ikev1_print(netdissect_options *ndo,
 	p = (const struct isakmp *)bp;
 	ep = ndo->ndo_snapend;
 
-	phase = (EXTRACT_32BITS(base->msgid) == 0) ? 1 : 2;
+	phase = (EXTRACT_BE_U_4(base->msgid) == 0) ? 1 : 2;
 	if (phase == 1)
 		ND_PRINT((ndo," phase %d", phase));
 	else
@@ -2981,7 +2982,7 @@ ikev2_print(netdissect_options *ndo,
 	p = (const struct isakmp *)bp;
 	ep = ndo->ndo_snapend;
 
-	phase = (EXTRACT_32BITS(base->msgid) == 0) ? 1 : 2;
+	phase = (EXTRACT_BE_U_4(base->msgid) == 0) ? 1 : 2;
 	if (phase == 1)
 		ND_PRINT((ndo, " parent_sa"));
 	else
@@ -3115,7 +3116,7 @@ isakmp_rfc3948_print(netdissect_options *ndo,
 
 	/* must be an ESP packet */
 	{
-		int nh, enh, padlen;
+		u_int nh, enh, padlen;
 		int advance;
 
 		ND_PRINT((ndo, "UDP-encap: "));