X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/24df77f09e26a72f662a82b92645707e0572d1cc..4da3308f277b7cb520a0edf43b2cca2bc0ed2e29:/print-ldp.c

diff --git a/print-ldp.c b/print-ldp.c
index 282bed62..0e0194a9 100644
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -307,15 +307,14 @@ ldp_tlv_print(netdissect_options *ndo,
 	ND_PRINT("\n\t      Address Family: %s, addresses",
                tok2str(af_values, "Unknown (%u)", af));
         switch (af) {
-        case AFNUM_INET:
+        case AFNUM_IP:
 	    while(tlv_tlen >= sizeof(nd_ipv4)) {
-		ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));
 		ND_PRINT(" %s", GET_IPADDR_STRING(tptr));
 		tlv_tlen-=sizeof(nd_ipv4);
 		tptr+=sizeof(nd_ipv4);
 	    }
             break;
-        case AFNUM_INET6:
+        case AFNUM_IP6:
 	    while(tlv_tlen >= sizeof(nd_ipv6)) {
 		ND_PRINT(" %s", GET_IP6ADDR_STRING(tptr));
 		tlv_tlen-=sizeof(nd_ipv6);
@@ -355,7 +354,7 @@ ldp_tlv_print(netdissect_options *ndo,
 	    af = GET_BE_U_2(tptr);
 	    tptr+=2;
 	    tlv_tlen-=2;
-	    if (af == AFNUM_INET) {
+	    if (af == AFNUM_IP) {
 		i=decode_prefix4(ndo, tptr, tlv_tlen, buf, sizeof(buf));
 		if (i == -2)
 		    goto trunc;
@@ -365,8 +364,7 @@ ldp_tlv_print(netdissect_options *ndo,
 		    ND_PRINT(": IPv4 prefix (invalid length)");
 		else
 		    ND_PRINT(": IPv4 prefix %s", buf);
-	    }
-	    else if (af == AFNUM_INET6) {
+	    } else if (af == AFNUM_IP6) {
 		i=decode_prefix6(ndo, tptr, tlv_tlen, buf, sizeof(buf));
 		if (i == -2)
 		    goto trunc;
@@ -376,8 +374,7 @@ ldp_tlv_print(netdissect_options *ndo,
 		    ND_PRINT(": IPv6 prefix (invalid length)");
 		else
 		    ND_PRINT(": IPv6 prefix %s", buf);
-	    }
-	    else
+	    } else
 		ND_PRINT(": Address family %u prefix", af);
 	    break;
 	case LDP_FEC_HOSTADDRESS:
@@ -539,8 +536,7 @@ ldp_tlv_print(netdissect_options *ndo,
     return(tlv_len+4); /* Type & Length fields not included */
 
 trunc:
-    nd_print_trunc(ndo);
-    return 0;
+    nd_trunc_longjmp(ndo);
 
 invalid:
     return(tlv_len+4); /* Type & Length fields not included */
@@ -595,10 +591,10 @@ ldp_pdu_print(netdissect_options *ndo,
     pdu_len = GET_BE_U_2(ldp_com_header->pdu_length);
     if (pdu_len < sizeof(struct ldp_common_header)-4) {
         /* length too short */
-        ND_PRINT("%sLDP, pdu-length: %u (too short, < %u)",
-               (ndo->ndo_vflag < 1) ? "" : "\n\t",
-               pdu_len,
-               (u_int)(sizeof(struct ldp_common_header)-4));
+        ND_PRINT("%sLDP, pdu-length: %u (too short, < %zu)",
+                 (ndo->ndo_vflag < 1) ? "" : "\n\t",
+                 pdu_len,
+                 sizeof(struct ldp_common_header)-4);
         return 0;
     }
 
@@ -628,13 +624,13 @@ ldp_pdu_print(netdissect_options *ndo,
         if (msg_len < sizeof(struct ldp_msg_header)-4) {
             /* length too short */
             /* FIXME vendor private / experimental check */
-            ND_PRINT("\n\t  %s Message (0x%04x), length: %u (too short, < %u)",
-                   tok2str(ldp_msg_values,
-                           "Unknown",
-                           msg_type),
-                   msg_type,
-                   msg_len,
-                   (u_int)(sizeof(struct ldp_msg_header)-4));
+            ND_PRINT("\n\t  %s Message (0x%04x), length: %u (too short, < %zu)",
+                     tok2str(ldp_msg_values,
+                             "Unknown",
+                             msg_type),
+                     msg_type,
+                     msg_len,
+                     sizeof(struct ldp_msg_header)-4);
             return 0;
         }
 
@@ -698,6 +694,5 @@ ldp_pdu_print(netdissect_options *ndo,
     }
     return pdu_len+4;
 trunc:
-    nd_print_trunc(ndo);
-    return 0;
+    nd_trunc_longjmp(ndo);
 }