DHCP: Fix printing IP address pairs options

[tcpdump] / print-ldp.c

diff --git a/print-ldp.c b/print-ldp.c
index 896bc40395fa0225e6b27d005b77202f0f2d5c0a..1ee453b20f5c9fd9b759c93ba13b96e4a72929b4 100644 (file)
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -16,9 +16,7 @@
 
 /* \summary: Label Distribution Protocol (LDP) printer */
 
 
 /* \summary: Label Distribution Protocol (LDP) printer */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 


@@ -328,11 +326,17 @@ ldp_tlv_print(netdissect_options *ndo,
        break;
 
     case LDP_TLV_COMMON_SESSION:
        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),
        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;
 
               );
        break;
 


@@ -364,8 +368,7 @@ ldp_tlv_print(netdissect_options *ndo,
                    ND_PRINT(": IPv4 prefix (invalid length)");
                else
                    ND_PRINT(": IPv4 prefix %s", buf);
                    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;
                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);
                    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:
                ND_PRINT(": Address family %u prefix", af);
            break;
        case LDP_FEC_HOSTADDRESS: