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

diff --git a/print-atm.c b/print-atm.c
index 03c77d45..ed29c6d5 100644
--- a/print-atm.c
+++ b/print-atm.c
@@ -259,7 +259,7 @@ atm_if_print(netdissect_options *ndo,
 	}
 
         /* Cisco Style NLPID ? */
-        if (*p == LLC_UI) {
+        if (EXTRACT_U_1(p) == LLC_UI) {
             if (ndo->ndo_eflag)
                 ND_PRINT((ndo, "CNLPID "));
             isoclns_print(ndo, p + 1, length - 1);
@@ -349,16 +349,16 @@ sig_print(netdissect_options *ndo,
 {
 	uint32_t call_ref;
 
-	ND_TCHECK(p[PROTO_POS]);
-	if (p[PROTO_POS] == Q2931) {
+	ND_TCHECK_1(p + PROTO_POS);
+	if (EXTRACT_U_1(p + PROTO_POS) == Q2931) {
 		/*
 		 * protocol:Q.2931 for User to Network Interface
 		 * (UNI 3.1) signalling
 		 */
 		ND_PRINT((ndo, "Q.2931"));
-		ND_TCHECK(p[MSG_TYPE_POS]);
+		ND_TCHECK_1(p + MSG_TYPE_POS);
 		ND_PRINT((ndo, ":%s ",
-		    tok2str(msgtype2str, "msgtype#%d", p[MSG_TYPE_POS])));
+		    tok2str(msgtype2str, "msgtype#%d", EXTRACT_U_1(p + MSG_TYPE_POS))));
 
 		/*
 		 * The call reference comes before the message type,
@@ -370,7 +370,7 @@ sig_print(netdissect_options *ndo,
 		ND_PRINT((ndo, "CALL_REF:0x%06x", call_ref));
 	} else {
 		/* SSCOP with some unknown protocol atop it */
-		ND_PRINT((ndo, "SSCOP, proto %d ", p[PROTO_POS]));
+		ND_PRINT((ndo, "SSCOP, proto %d ", EXTRACT_U_1(p + PROTO_POS)));
 	}
 	return;
 
@@ -460,7 +460,7 @@ oam_print (netdissect_options *ndo,
     } oam_ptr;
 
 
-    ND_TCHECK(*(p+ATM_HDR_LEN_NOHEC+hec));
+    ND_TCHECK_1(p + ATM_HDR_LEN_NOHEC + hec);
     cell_header = EXTRACT_BE_U_4(p + hec);
     cell_type = (EXTRACT_U_1((p + ATM_HDR_LEN_NOHEC + hec)) >> 4) & 0x0f;
     func_type = EXTRACT_U_1((p + ATM_HDR_LEN_NOHEC + hec)) & 0x0f;
@@ -538,7 +538,7 @@ oam_print (netdissect_options *ndo,
     }
 
     /* crc10 checksum verification */
-    ND_TCHECK2(*(p + OAM_CELLTYPE_FUNCTYPE_LEN + OAM_FUNCTION_SPECIFIC_LEN), 2);
+    ND_TCHECK_2(p + OAM_CELLTYPE_FUNCTYPE_LEN + OAM_FUNCTION_SPECIFIC_LEN);
     cksum = EXTRACT_BE_U_2(p + OAM_CELLTYPE_FUNCTYPE_LEN + OAM_FUNCTION_SPECIFIC_LEN)
         & OAM_CRC10_MASK;
     cksum_shouldbe = verify_crc10_cksum(0, p, OAM_PAYLOAD_LEN);