From: Francois-Xavier Le Bail Date: Thu, 14 Dec 2017 21:51:27 +0000 (+0100) Subject: ISIS: Replace ND_TCHECK2 calls by ND_TCHECK_LEN calls X-Git-Tag: tcpdump-4.99-bp~1630 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/3e6a7011af642fe1a59eba634985c1d48479c5b0?ds=inline ISIS: Replace ND_TCHECK2 calls by ND_TCHECK_LEN calls --- diff --git a/print-isoclns.c b/print-isoclns.c index b92d2b14..a1b4d07d 100644 --- a/print-isoclns.c +++ b/print-isoclns.c @@ -2835,7 +2835,7 @@ isis_print(netdissect_options *ndo, tmp-=sizeof(tlv_ptp_adj->extd_local_circuit_id); } if(tmp>=SYSTEM_ID_LEN) { - ND_TCHECK2(tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN); + ND_TCHECK_LEN(tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN); ND_PRINT((ndo, "\n\t Neighbor System-ID: %s", isis_print_id(tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN))); tmp-=SYSTEM_ID_LEN; @@ -2960,11 +2960,11 @@ isis_print(netdissect_options *ndo, ND_TCHECK((tlv_lsp->lsp_id)[LSP_ID_LEN-1]); ND_PRINT((ndo, "\n\t lsp-id: %s", isis_print_id(tlv_lsp->lsp_id, LSP_ID_LEN))); - ND_TCHECK2(tlv_lsp->sequence_number, 4); + ND_TCHECK_LEN(tlv_lsp->sequence_number, 4); ND_PRINT((ndo, ", seq: 0x%08x", EXTRACT_BE_U_4(tlv_lsp->sequence_number))); - ND_TCHECK2(tlv_lsp->remaining_lifetime, 2); + ND_TCHECK_LEN(tlv_lsp->remaining_lifetime, 2); ND_PRINT((ndo, ", lifetime: %5ds", EXTRACT_BE_U_2(tlv_lsp->remaining_lifetime))); - ND_TCHECK2(tlv_lsp->checksum, 2); + ND_TCHECK_LEN(tlv_lsp->checksum, 2); ND_PRINT((ndo, ", chksum: 0x%04x", EXTRACT_BE_U_2(tlv_lsp->checksum))); tmp-=sizeof(struct isis_tlv_lsp); tlv_lsp++;