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-bootp.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-bootp.c')
| -rw-r--r-- | print-bootp.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/print-bootp.c b/print-bootp.c index 626272f1..8ffaf409 100644 --- a/print-bootp.c +++ b/print-bootp.c @@ -283,12 +283,10 @@ bootp_print(netdissect_options *ndo, ndo->ndo_protocol = "bootp"; bp = (const struct bootp *)cp; - ND_TCHECK_1(bp->bp_op); bp_op = GET_U_1(bp->bp_op); ND_PRINT("BOOTP/DHCP, %s", tok2str(bootp_op_values, "unknown (0x%02x)", bp_op)); - ND_TCHECK_1(bp->bp_hlen); bp_htype = GET_U_1(bp->bp_htype); bp_hlen = GET_U_1(bp->bp_hlen); if (bp_htype == 1 && bp_hlen == 6 && bp_op == BOOTPREQUEST) { @@ -319,7 +317,6 @@ bootp_print(netdissect_options *ndo, if (GET_BE_U_2(bp->bp_secs)) ND_PRINT(", secs %u", GET_BE_U_2(bp->bp_secs)); - ND_TCHECK_2(bp->bp_flags); ND_PRINT(", Flags [%s]", bittok2str(bootp_flag_values, "none", GET_BE_U_2(bp->bp_flags))); if (ndo->ndo_vflag > 1) @@ -351,8 +348,7 @@ bootp_print(netdissect_options *ndo, ND_PRINT("\n\t Client-Ethernet-Address %s", GET_ETHERADDR_STRING(bp->bp_chaddr)); } - ND_TCHECK_1(bp->bp_sname); /* check first char only */ - if (GET_U_1(bp->bp_sname)) { + if (GET_U_1(bp->bp_sname)) { /* get first char only */ ND_PRINT("\n\t sname \""); if (nd_printztn(ndo, bp->bp_sname, (u_int)sizeof(bp->bp_sname), ndo->ndo_snapend) == 0) { @@ -362,8 +358,7 @@ bootp_print(netdissect_options *ndo, } ND_PRINT("\""); } - ND_TCHECK_1(bp->bp_file); /* check first char only */ - if (GET_U_1(bp->bp_file)) { + if (GET_U_1(bp->bp_file)) { /* get first char only */ ND_PRINT("\n\t file \""); if (nd_printztn(ndo, bp->bp_file, (u_int)sizeof(bp->bp_file), ndo->ndo_snapend) == 0) { @@ -612,7 +607,6 @@ rfc1048_print(netdissect_options *ndo, len = 0; else { /* Get the length; check for truncation */ - ND_TCHECK_1(bp); len = GET_U_1(bp); bp++; } |