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-juniper.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-juniper.c')
| -rw-r--r-- | print-juniper.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/print-juniper.c b/print-juniper.c index e668d0e7..0a26c8bc 100644 --- a/print-juniper.c +++ b/print-juniper.c @@ -816,7 +816,6 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo, p+=l2info.header_len; - ND_TCHECK_2(p); extracted_ethertype = GET_BE_U_2(p); /* this DLT contains nothing but raw PPPoE frames, * prepended with a type field*/ @@ -829,11 +828,6 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo, ND_PRINT("unknown ethertype 0x%04x", extracted_ethertype); ndo->ndo_ll_hdr_len += l2info.header_len; - return; - -trunc: - nd_print_trunc(ndo); - ndo->ndo_ll_hdr_len += l2info.header_len; } #endif @@ -1050,7 +1044,6 @@ juniper_atm1_if_print(netdissect_options *ndo, return; } - ND_TCHECK_3(p); if (GET_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */ GET_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */ @@ -1074,11 +1067,6 @@ juniper_atm1_if_print(netdissect_options *ndo, } ndo->ndo_ll_hdr_len += l2info.header_len; - return; - -trunc: - nd_print_trunc(ndo); - ndo->ndo_ll_hdr_len += l2info.header_len; } #endif @@ -1114,7 +1102,6 @@ juniper_atm2_if_print(netdissect_options *ndo, return; } - ND_TCHECK_3(p); if (GET_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */ GET_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */ @@ -1151,11 +1138,6 @@ juniper_atm2_if_print(netdissect_options *ndo, } ndo->ndo_ll_hdr_len += l2info.header_len; - return; - -trunc: - nd_print_trunc(ndo); - ndo->ndo_ll_hdr_len += l2info.header_len; } /* try to guess, based on all PPP protos that are supported in @@ -1326,7 +1308,6 @@ juniper_parse_header(netdissect_options *ndo, tptr = p+jnx_header_len; /* ok to read extension length ? */ - ND_TCHECK_2(tptr); jnx_ext_len = GET_BE_U_2(tptr); jnx_header_len += 2; tptr +=2; @@ -1481,7 +1462,6 @@ juniper_parse_header(netdissect_options *ndo, if (ndo->ndo_eflag) ND_PRINT(": "); /* print demarc b/w L2/L3*/ - ND_TCHECK_2(p + l2info->cookie_len); l2info->proto = GET_BE_U_2(p + l2info->cookie_len); break; } @@ -1512,7 +1492,6 @@ juniper_parse_header(netdissect_options *ndo, case DLT_JUNIPER_MLFR: switch (l2info->cookie_type) { case LS_COOKIE_ID: - ND_TCHECK_2(p); l2info->bundle = l2info->cookie[1]; l2info->proto = GET_BE_U_2(p); l2info->header_len += 2; @@ -1537,7 +1516,6 @@ juniper_parse_header(netdissect_options *ndo, case DLT_JUNIPER_MFR: switch (l2info->cookie_type) { case LS_COOKIE_ID: - ND_TCHECK_2(p); l2info->bundle = l2info->cookie[1]; l2info->proto = GET_BE_U_2(p); l2info->header_len += 2; |