diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-09-05 19:40:32 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-09-06 20:22:29 +0200 |
| commit | abc8c2d61c65757011d9d32abb01cd1e51232f3a (patch) | |
| tree | a4c9890086314bffc5236c815c773975e471cc4a /print-carp.c | |
| parent | 54b5db3dde658894be730b15480f9b6e27b717a0 (diff) | |
| download | tcpdump-abc8c2d61c65757011d9d32abb01cd1e51232f3a.tar.gz | |
Remove many (762) now redundant ND_TCHECK_n() calls
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-carp.c')
| -rw-r--r-- | print-carp.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/print-carp.c b/print-carp.c index 6ce70566..75f50668 100644 --- a/print-carp.c +++ b/print-carp.c @@ -52,7 +52,6 @@ carp_print(netdissect_options *ndo, const u_char *bp, u_int len, u_int ttl) const char *type_s; ndo->ndo_protocol = "carp"; - ND_TCHECK_1(bp); version = (GET_U_1(bp) & 0xf0) >> 4; type = GET_U_1(bp) & 0x0f; if (type == 1) @@ -64,8 +63,6 @@ carp_print(netdissect_options *ndo, const u_char *bp, u_int len, u_int ttl) ND_PRINT("[ttl=%u!] ", ttl); if (version != 2 || type != 1) return; - ND_TCHECK_1(bp + 2); - ND_TCHECK_1(bp + 5); ND_PRINT("vhid=%u advbase=%u advskew=%u authlen=%u ", GET_U_1(bp + 1), GET_U_1(bp + 5), GET_U_1(bp + 2), GET_U_1(bp + 3)); @@ -78,8 +75,4 @@ carp_print(netdissect_options *ndo, const u_char *bp, u_int len, u_int ttl) GET_BE_U_2(bp + 6)); } ND_PRINT("counter=%" PRIu64, GET_BE_U_8(bp + 8)); - - return; -trunc: - nd_print_trunc(ndo); } |