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-tftp.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-tftp.c')
| -rw-r--r-- | print-tftp.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/print-tftp.c b/print-tftp.c index b6f9107e..e90fb68c 100644 --- a/print-tftp.c +++ b/print-tftp.c @@ -104,7 +104,6 @@ tftp_print(netdissect_options *ndo, /* Print tftp request type */ if (length < 2) goto trunc; - ND_TCHECK_2(bp); opcode = GET_BE_U_2(bp); cp = tok2str(op2str, "tftp-#%u", opcode); ND_PRINT(", %s", cp); @@ -142,7 +141,6 @@ tftp_print(netdissect_options *ndo, /* Print options, if any */ while (length != 0) { - ND_TCHECK_1(bp); if (GET_U_1(bp) != '\0') ND_PRINT(" "); ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend); @@ -156,7 +154,6 @@ tftp_print(netdissect_options *ndo, case OACK: /* Print options */ while (length != 0) { - ND_TCHECK_1(bp); if (GET_U_1(bp) != '\0') ND_PRINT(" "); ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend); @@ -171,7 +168,6 @@ tftp_print(netdissect_options *ndo, case DATA: if (length < 2) goto trunc; /* no block number */ - ND_TCHECK_2(bp); ND_PRINT(" block %u", GET_BE_U_2(bp)); break; @@ -179,7 +175,6 @@ tftp_print(netdissect_options *ndo, /* Print error code string */ if (length < 2) goto trunc; /* no error code */ - ND_TCHECK_2(bp); ND_PRINT(" %s", tok2str(err2str, "tftp-err-#%u \"", GET_BE_U_2(bp))); bp += 2; |