Use more the ND_TTEST_1() macro

[tcpdump] / print-isoclns.c

diff --git a/print-isoclns.c b/print-isoclns.c
index b92d2b145189b4e6aaad5ac5515aafa94648d24a..3d09f994eb564184b275af7d40feafd19e96c891 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -671,7 +671,7 @@ struct isis_tlv_lsp {
 void
 isoclns_print(netdissect_options *ndo, const uint8_t *p, u_int length)
 {
-       if (!ND_TTEST(*p)) { /* enough bytes on the wire ? */
+       if (!ND_TTEST_1(p)) { /* enough bytes on the wire ? */
                ND_PRINT((ndo, "|OSI"));
                return;
        }
@@ -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++;