]> The Tcpdump Group git mirrors - tcpdump/commitdiff
RRCP: Modernize packet parsing style.
authorDenis Ovsienko <[email protected]>
Wed, 2 Dec 2020 21:41:50 +0000 (21:41 +0000)
committerDenis Ovsienko <[email protected]>
Wed, 2 Dec 2020 21:41:50 +0000 (21:41 +0000)
Remove all ND_TCHECK*() instances as they are redundant.

print-rrcp.c

index 831809f04fc58867dec90611aa5064810121076f..9803f75fe4fabc7af0ab0661a7c55b9a394a9b40 100644 (file)
@@ -98,7 +98,6 @@ rrcp_print(netdissect_options *ndo,
 
        ndo->ndo_protocol = "rrcp";
        rrcp_proto = GET_U_1(cp + RRCP_PROTO_OFFSET);
-       ND_TCHECK_1(cp + RRCP_OPCODE_ISREPLY_OFFSET);
        rrcp_opcode = GET_U_1((cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_OPCODE_MASK;
        if (src != NULL && dst != NULL) {
                ND_PRINT("%s > %s, ",
@@ -113,7 +112,6 @@ rrcp_print(netdissect_options *ndo,
                     tok2str(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode));
        }
        if (rrcp_opcode==1 || rrcp_opcode==2){
-           ND_TCHECK_6(cp + RRCP_REG_ADDR_OFFSET);
            ND_PRINT(" addr=0x%04x, data=0x%08x",
                     GET_LE_U_2(cp + RRCP_REG_ADDR_OFFSET),
                     GET_LE_U_4(cp + RRCP_REG_DATA_OFFSET));
@@ -135,8 +133,4 @@ rrcp_print(netdissect_options *ndo,
                    GET_BE_U_4(cp + RRCP_COOKIE2_OFFSET),
                    GET_BE_U_4(cp + RRCP_COOKIE1_OFFSET));
        }
-       return;
-
-trunc:
-       nd_print_trunc(ndo);
 }