X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1a9542cfd1f59a329e8cb32fb1737e7c8a11ecd2..0f15ed5545b143ced64cc1a99abbd5c1cbdfd729:/print-ldp.c

diff --git a/print-ldp.c b/print-ldp.c
index 896bc403..1ee453b2 100644
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -16,9 +16,7 @@
 
 /* \summary: Label Distribution Protocol (LDP) printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -328,11 +326,17 @@ ldp_tlv_print(netdissect_options *ndo,
 	break;
 
     case LDP_TLV_COMMON_SESSION:
-	TLV_TCHECK(8);
+	TLV_TCHECK(14);
 	ND_PRINT("\n\t      Version: %u, Keepalive: %us, Flags: [Downstream %s, Loop Detection %s]",
 	       GET_BE_U_2(tptr), GET_BE_U_2(tptr + 2),
-	       (GET_BE_U_2(tptr + 6)&0x8000) ? "On Demand" : "Unsolicited",
-	       (GET_BE_U_2(tptr + 6)&0x4000) ? "Enabled" : "Disabled"
+	       (GET_BE_U_2(tptr + 4)&0x8000) ? "On Demand" : "Unsolicited",
+	       (GET_BE_U_2(tptr + 4)&0x4000) ? "Enabled" : "Disabled"
+	       );
+	ND_PRINT("\n\t      Path Vector Limit %u, Max-PDU length: %u, Receiver Label-Space-ID %s:%u",
+	       GET_U_1(tptr+5),
+	       GET_BE_U_2(tptr+6),
+	       GET_IPADDR_STRING(tptr+8),
+	       GET_BE_U_2(tptr+12)
 	       );
 	break;
 
@@ -364,8 +368,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_INET6) {
 		i=decode_prefix6(ndo, tptr, tlv_tlen, buf, sizeof(buf));
 		if (i == -2)
 		    goto trunc;
@@ -375,8 +378,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: