diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-08-10 16:22:37 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-09-05 14:59:21 +0200 |
| commit | 929e4be621ebdcede37865a5767a175f083f9138 (patch) | |
| tree | bf6ecbc038696e66176b2d50e04e015767f23b3d /print-rrcp.c | |
| parent | 54b5db3dde658894be730b15480f9b6e27b717a0 (diff) | |
| download | tcpdump-test-rc.tar.gz | |
Remove many (761) redundant ND_TCHECK_n() callstest-rc
ND_TCHECK_n(e), n in { 1, 2, 3, 4, 8 }.
They are redundant because they are followed by a GET_.*_n(e) call,
same n, same e, which do the bounds check.
Remove unused 'trunc' labels and most associated codes.
Update the outputs of some tests accordingly.
Diffstat (limited to 'print-rrcp.c')
| -rw-r--r-- | print-rrcp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/print-rrcp.c b/print-rrcp.c index e18885f6..831809f0 100644 --- a/print-rrcp.c +++ b/print-rrcp.c @@ -97,7 +97,6 @@ rrcp_print(netdissect_options *ndo, uint8_t rrcp_opcode; ndo->ndo_protocol = "rrcp"; - ND_TCHECK_1(cp + RRCP_PROTO_OFFSET); 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; @@ -120,13 +119,11 @@ rrcp_print(netdissect_options *ndo, GET_LE_U_4(cp + RRCP_REG_DATA_OFFSET)); } if (rrcp_proto==1){ - ND_TCHECK_2(cp + RRCP_AUTHKEY_OFFSET); ND_PRINT(", auth=0x%04x", GET_BE_U_2(cp + RRCP_AUTHKEY_OFFSET)); } if (rrcp_proto==1 && rrcp_opcode==0 && ((GET_U_1(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY)){ - ND_TCHECK_4(cp + RRCP_VENDOR_ID_OFFSET); ND_PRINT(" downlink_port=%u, uplink_port=%u, uplink_mac=%s, vendor_id=%08x ,chip_id=%04x ", GET_U_1(cp + RRCP_DOWNLINK_PORT_OFFSET), GET_U_1(cp + RRCP_UPLINK_PORT_OFFSET), @@ -134,7 +131,6 @@ rrcp_print(netdissect_options *ndo, GET_BE_U_4(cp + RRCP_VENDOR_ID_OFFSET), GET_BE_U_2(cp + RRCP_CHIP_ID_OFFSET)); }else if (rrcp_opcode==1 || rrcp_opcode==2 || rrcp_proto==2){ - ND_TCHECK_4(cp + RRCP_COOKIE2_OFFSET); ND_PRINT(", cookie=0x%08x%08x ", GET_BE_U_4(cp + RRCP_COOKIE2_OFFSET), GET_BE_U_4(cp + RRCP_COOKIE1_OFFSET)); |