Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-rrcp.c

diff --git a/print-rrcp.c b/print-rrcp.c
index 5b612e838be435cce595f4cd3a3010d62aa470fe..ddacf94c80c180ee03c793e66d36291a49f299ad 100644 (file)
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -108,33 +108,33 @@ rrcp_print(netdissect_options *ndo,
        }
        ND_PRINT((ndo, "%s %s",
                tok2str(proto_values,"RRCP-0x%02x",rrcp_proto),
        }
        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){
        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_U_2(cp + RRCP_REG_ADDR_OFFSET),
                     EXTRACT_LE_U_4(cp + RRCP_REG_DATA_OFFSET)));
        }
        if (rrcp_proto==1){
            ND_PRINT((ndo, " addr=0x%04x, data=0x%08x",
                     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_U_2(cp + RRCP_AUTHKEY_OFFSET)));
        }
        if (rrcp_proto==1 && rrcp_opcode==0 &&
            ND_PRINT((ndo, ", auth=0x%04x",
                  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 ",
            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_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){
                     etheraddr_string(ndo, cp + RRCP_UPLINK_MAC_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_U_4(cp + RRCP_COOKIE2_OFFSET),
                    EXTRACT_BE_U_4(cp + RRCP_COOKIE1_OFFSET)));
            ND_PRINT((ndo, ", cookie=0x%08x%08x ",
                    EXTRACT_BE_U_4(cp + RRCP_COOKIE2_OFFSET),
                    EXTRACT_BE_U_4(cp + RRCP_COOKIE1_OFFSET)));