X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/51e180c4fb05a88ad6687a23cc983955cd9ea431..40fa95e88afbf944949ee55ccd6b34bb0e7a8f49:/print-isoclns.c

diff --git a/print-isoclns.c b/print-isoclns.c
index 288c4b18..ddd55953 100644
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -1022,8 +1022,6 @@ clnp_print(netdissect_options *ndo,
                             }
                             if (source_address_length > 0) {
                                     source_address=(tptr+1);
-                                    ND_TCHECK_LEN(source_address,
-                                                  source_address_length);
                                     ND_PRINT("\n\t    NSAP address (length %u): %s",
                                            source_address_length,
                                            GET_ISONSAP_STRING(source_address, source_address_length));
@@ -1300,7 +1298,7 @@ esis_print(netdissect_options *ndo,
 		pptr += netal;
                 li -= netal;
 
-		if (snpal == 6)
+		if (snpal == MAC_ADDR_LEN)
 			ND_PRINT("\n\t  SNPA (length: %u): %s",
 			       snpal,
 			       GET_ETHERADDR_STRING(snpa));
@@ -1467,8 +1465,7 @@ isis_print_mcid(netdissect_options *ndo,
   ND_TCHECK_SIZE(mcid);
   ND_PRINT("ID: %u, Name: ", GET_U_1(mcid->format_id));
 
-  if (nd_printzp(ndo, mcid->name, 32, ndo->ndo_snapend))
-      goto trunc;
+  nd_printjnp(ndo, mcid->name, sizeof(mcid->name));
 
   ND_PRINT("\n\t              Lvl: %u", GET_BE_U_2(mcid->revision_lvl));
 
@@ -2310,9 +2307,8 @@ isis_print_extd_ip_reach(netdissect_options *ndo,
 
     byte_length = (bit_length + 7) / 8; /* prefix has variable length encoding */
 
-    ND_TCHECK_LEN(tptr, byte_length);
     memset(prefix, 0, sizeof(prefix));   /* clear the copy buffer */
-    memcpy(prefix,tptr,byte_length);    /* copy as much as is stored in the TLV */
+    GET_CPY_BYTES(prefix,tptr,byte_length);    /* copy as much as is stored in the TLV */
     tptr+=byte_length;
     processed+=byte_length;
 
@@ -2363,8 +2359,6 @@ isis_print_extd_ip_reach(netdissect_options *ndo,
         }
     }
     return (processed);
-trunc:
-    return 0;
 }
 
 static void
@@ -2891,7 +2885,6 @@ isis_print(netdissect_options *ndo,
 		tlen--;
 		if (tlen < alen)
 		    goto tlv_trunc;
-	        ND_TCHECK_LEN(tptr, alen);
 		ND_PRINT("\n\t      Area address (length: %u): %s",
                        alen,
                        GET_ISONSAP_STRING(tptr, alen));
@@ -3123,8 +3116,7 @@ isis_print(netdissect_options *ndo,
 
 	    switch (auth_type) {
 	    case ISIS_SUBTLV_AUTH_SIMPLE:
-		if (nd_printzp(ndo, tptr, tlen, ndo->ndo_snapend))
-		    goto trunc;
+		nd_printjnp(ndo, tptr, tlen);
 		break;
 	    case ISIS_SUBTLV_AUTH_MD5:
 		for(i=0;i<tlen;i++) {
@@ -3236,7 +3228,6 @@ isis_print(netdissect_options *ndo,
 	case ISIS_TLV_TE_ROUTER_ID:
 	    if (tlen < sizeof(nd_ipv4))
 	        goto tlv_trunc;
-	    ND_TCHECK_LEN(pptr, sizeof(nd_ipv4));
 	    ND_PRINT("\n\t      Traffic Engineering Router ID: %s", GET_IPADDR_STRING(pptr));
 	    break;
 
@@ -3244,7 +3235,6 @@ isis_print(netdissect_options *ndo,
 	    while (tlen != 0) {
                 if (tlen < sizeof(nd_ipv4))
                     goto tlv_trunc;
-		ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));
 		ND_PRINT("\n\t      IPv4 interface address: %s", GET_IPADDR_STRING(tptr));
 		tptr += sizeof(nd_ipv4);
 		tlen -= sizeof(nd_ipv4);
@@ -3253,8 +3243,7 @@ isis_print(netdissect_options *ndo,
 
 	case ISIS_TLV_HOSTNAME:
 	    ND_PRINT("\n\t      Hostname: ");
-	    if (nd_printzp(ndo, tptr, tlen, ndo->ndo_snapend))
-		goto trunc;
+	    nd_printjnp(ndo, tptr, tlen);
 	    break;
 
 	case ISIS_TLV_SHARED_RISK_GROUP:
@@ -3274,14 +3263,12 @@ isis_print(netdissect_options *ndo,
 
 	    if (tlen < sizeof(nd_ipv4))
 	        break;
-	    ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));
 	    ND_PRINT("\n\t      IPv4 interface address: %s", GET_IPADDR_STRING(tptr));
 	    tptr+=sizeof(nd_ipv4);
 	    tlen-=sizeof(nd_ipv4);
 
 	    if (tlen < sizeof(nd_ipv4))
 	        break;
-	    ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));
 	    ND_PRINT("\n\t      IPv4 neighbor address: %s", GET_IPADDR_STRING(tptr));
 	    tptr+=sizeof(nd_ipv4);
 	    tlen-=sizeof(nd_ipv4);
@@ -3463,7 +3450,6 @@ isis_print(netdissect_options *ndo,
                 }
                 if (tlen < prefix_len/2)
                     break;
-                ND_TCHECK_LEN(tptr, prefix_len / 2);
                 ND_PRINT("\n\t\tAddress: %s/%u",
                        GET_ISONSAP_STRING(tptr, prefix_len / 2), prefix_len * 4);
                 tptr+=prefix_len/2;