X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/8bb03d53090d8749f3cfa38531333042d665dd36..d7b497cac78b6e22a66a6bae9bdec60a8044f67a:/print-rrcp.c

diff --git a/print-rrcp.c b/print-rrcp.c
index 866e75b9..ddacf94c 100644
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -98,9 +98,9 @@ rrcp_print(netdissect_options *ndo,
 	uint8_t rrcp_opcode;
 
 	ND_TCHECK(*(cp + RRCP_PROTO_OFFSET));
-	rrcp_proto = *(cp + RRCP_PROTO_OFFSET);
+	rrcp_proto = EXTRACT_U_1(cp + RRCP_PROTO_OFFSET);
 	ND_TCHECK(*(cp + RRCP_OPCODE_ISREPLY_OFFSET));
-	rrcp_opcode = EXTRACT_8BITS((cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_OPCODE_MASK;
+	rrcp_opcode = EXTRACT_U_1((cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_OPCODE_MASK;
 	if (src != NULL && dst != NULL) {
 		ND_PRINT((ndo, "%s > %s, ",
 			(src->addr_string)(ndo, src->addr),
@@ -108,36 +108,36 @@ rrcp_print(netdissect_options *ndo,
 	}
 	ND_PRINT((ndo, "%s %s",
 		tok2str(proto_values,"RRCP-0x%02x",rrcp_proto),
-		((*(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY) ? "reply" : "query"));
+		((EXTRACT_U_1(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY) ? "reply" : "query"));
 	if (rrcp_proto==1){
     	    ND_PRINT((ndo, ": %s",
 		     tok2str(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode)));
 	}
 	if (rrcp_opcode==1 || rrcp_opcode==2){
-	    ND_TCHECK2(*(cp + RRCP_REG_ADDR_OFFSET), 6);
+	    ND_TCHECK_6(cp + RRCP_REG_ADDR_OFFSET);
     	    ND_PRINT((ndo, " addr=0x%04x, data=0x%08x",
-		     EXTRACT_LE_16BITS(cp + RRCP_REG_ADDR_OFFSET),
-		     EXTRACT_LE_32BITS(cp + RRCP_REG_DATA_OFFSET)));
+		     EXTRACT_LE_U_2(cp + RRCP_REG_ADDR_OFFSET),
+		     EXTRACT_LE_U_4(cp + RRCP_REG_DATA_OFFSET)));
 	}
 	if (rrcp_proto==1){
-	    ND_TCHECK2(*(cp + RRCP_AUTHKEY_OFFSET), 2);
+	    ND_TCHECK_2(cp + RRCP_AUTHKEY_OFFSET);
     	    ND_PRINT((ndo, ", auth=0x%04x",
-		  EXTRACT_BE_16BITS(cp + RRCP_AUTHKEY_OFFSET)));
+		  EXTRACT_BE_U_2(cp + RRCP_AUTHKEY_OFFSET)));
 	}
 	if (rrcp_proto==1 && rrcp_opcode==0 &&
-	     ((*(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY)){
-	    ND_TCHECK2(*(cp + RRCP_VENDOR_ID_OFFSET), 4);
+	     ((EXTRACT_U_1(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY)){
+	    ND_TCHECK_4(cp + RRCP_VENDOR_ID_OFFSET);
 	    ND_PRINT((ndo, " downlink_port=%d, uplink_port=%d, uplink_mac=%s, vendor_id=%08x ,chip_id=%04x ",
-		     *(cp + RRCP_DOWNLINK_PORT_OFFSET),
-		     *(cp + RRCP_UPLINK_PORT_OFFSET),
+		     EXTRACT_U_1(cp + RRCP_DOWNLINK_PORT_OFFSET),
+		     EXTRACT_U_1(cp + RRCP_UPLINK_PORT_OFFSET),
 		     etheraddr_string(ndo, cp + RRCP_UPLINK_MAC_OFFSET),
-		     EXTRACT_BE_32BITS(cp + RRCP_VENDOR_ID_OFFSET),
-		     EXTRACT_BE_16BITS(cp + RRCP_CHIP_ID_OFFSET)));
+		     EXTRACT_BE_U_4(cp + RRCP_VENDOR_ID_OFFSET),
+		     EXTRACT_BE_U_2(cp + RRCP_CHIP_ID_OFFSET)));
 	}else if (rrcp_opcode==1 || rrcp_opcode==2 || rrcp_proto==2){
-	    ND_TCHECK2(*(cp + RRCP_COOKIE2_OFFSET), 4);
+	    ND_TCHECK_4(cp + RRCP_COOKIE2_OFFSET);
 	    ND_PRINT((ndo, ", cookie=0x%08x%08x ",
-		    EXTRACT_BE_32BITS(cp + RRCP_COOKIE2_OFFSET),
-		    EXTRACT_BE_32BITS(cp + RRCP_COOKIE1_OFFSET)));
+		    EXTRACT_BE_U_4(cp + RRCP_COOKIE2_OFFSET),
+		    EXTRACT_BE_U_4(cp + RRCP_COOKIE1_OFFSET)));
 	}
 	return;