]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ldp.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
IPv6: Print the protocol name before any test
[tcpdump] / print-ldp.c
diff --git a/print-ldp.c b/print-ldp.c
index 1243104855b7414faaca60c2623b21695192199e..0e0194a933867cb93ed5c33b72e72ec471623f36 100644 (file)
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -10,33 +10,26 @@
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *
- * Original code by Hannes Gredler (hannes@juniper.net)
+ * Original code by Hannes Gredler (hannes@gredler.at)
  *  and Steinar Haug ([email protected])
  */
 
  *  and Steinar Haug ([email protected])
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ldp.c,v 1.20 2006-06-23 02:03:09 hannes Exp $";
-#endif
+/* \summary: Label Distribution Protocol (LDP) printer */
 
 #ifdef HAVE_CONFIG_H
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #endif
 
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "netdissect-stdinc.h"
 
 
-#include "interface.h"
-#include "decode_prefix.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
 #include "l2vpn.h"
 #include "af.h"
 
 #include "extract.h"
 #include "addrtoname.h"
 
 #include "l2vpn.h"
 #include "af.h"
 
+
 /*
  * ldp common header
  *
 /*
  * ldp common header
  *
@@ -53,10 +46,10 @@ static const char rcsid[] _U_ =
  */
 
 struct ldp_common_header {
  */
 
 struct ldp_common_header {
-    u_int8_t version[2];
-    u_int8_t pdu_length[2];
-    u_int8_t lsr_id[4];
-    u_int8_t label_space[2];
+    nd_uint16_t version;
+    nd_uint16_t pdu_length;
+    nd_ipv4     lsr_id;
+    nd_uint16_t label_space;
 };
 
 #define LDP_VERSION 1
 };
 
 #define LDP_VERSION 1
@@ -86,13 +79,13 @@ struct ldp_common_header {
  */
 
 struct ldp_msg_header {
  */
 
 struct ldp_msg_header {
-    u_int8_t type[2];
-    u_int8_t length[2];
-    u_int8_t id[4];
+    nd_uint16_t type;
+    nd_uint16_t length;
+    nd_uint32_t id;
 };
 
 };
 
-#define        LDP_MASK_MSG_TYPE(x)  ((x)&0x7fff) 
-#define        LDP_MASK_U_BIT(x)     ((x)&0x8000) 
+#define        LDP_MASK_MSG_TYPE(x)  ((x)&0x7fff)
+#define        LDP_MASK_U_BIT(x)     ((x)&0x8000)
 
 #define        LDP_MSG_NOTIF                0x0001
 #define        LDP_MSG_HELLO                0x0100
 
 #define        LDP_MSG_NOTIF                0x0001
 #define        LDP_MSG_HELLO                0x0100
@@ -126,8 +119,8 @@ static const struct tok ldp_msg_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 
-#define        LDP_MASK_TLV_TYPE(x)  ((x)&0x3fff) 
-#define        LDP_MASK_F_BIT(x) ((x)&0x4000) 
+#define        LDP_MASK_TLV_TYPE(x)  ((x)&0x3fff)
+#define        LDP_MASK_F_BIT(x) ((x)&0x4000)
 
 #define        LDP_TLV_FEC                  0x0100
 #define        LDP_TLV_ADDRESS_LIST         0x0101
 
 #define        LDP_TLV_FEC                  0x0100
 #define        LDP_TLV_ADDRESS_LIST         0x0101
@@ -180,7 +173,7 @@ static const struct tok ldp_tlv_values[] = {
 #define LDP_FEC_WILDCARD       0x01
 #define LDP_FEC_PREFIX         0x02
 #define LDP_FEC_HOSTADDRESS    0x03
 #define LDP_FEC_WILDCARD       0x01
 #define LDP_FEC_PREFIX         0x02
 #define LDP_FEC_HOSTADDRESS    0x03
-/* From draft-martini-l2circuit-trans-mpls-13.txt */
+/* From RFC 4906; should probably be updated to RFC 4447 (e.g., VC -> PW) */
 #define LDP_FEC_MARTINI_VC     0x80
 
 static const struct tok ldp_fec_values[] = {
 #define LDP_FEC_MARTINI_VC     0x80
 
 static const struct tok ldp_fec_values[] = {
@@ -218,10 +211,9 @@ static const struct tok ldp_fec_martini_ifparm_vccv_cv_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 
-int ldp_msg_print(register const u_char *);
-int ldp_tlv_print(register const u_char *);
-   
-/* 
+static u_int ldp_pdu_print(netdissect_options *, const u_char *);
+
+/*
  * ldp tlv header
  *
  *  0                   1                   2                   3
  * ldp tlv header
  *
  *  0                   1                   2                   3
@@ -238,12 +230,21 @@ int ldp_tlv_print(register const u_char *);
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
 
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
 
-int
-ldp_tlv_print(register const u_char *tptr) {
+#define TLV_TCHECK(minlen) \
+    if (tlv_tlen < minlen) { \
+        ND_PRINT(" [tlv length %u < %u]", tlv_tlen, minlen); \
+        nd_print_invalid(ndo); \
+        goto invalid; \
+    }
 
 
+static u_int
+ldp_tlv_print(netdissect_options *ndo,
+              const u_char *tptr,
+              u_int msg_tlen)
+{
     struct ldp_tlv_header {
     struct ldp_tlv_header {
-        u_int8_t type[2];
-        u_int8_t length[2];
+        nd_uint16_t type;
+        nd_uint16_t length;
     };
 
     const struct ldp_tlv_header *ldp_tlv_header;
     };
 
     const struct ldp_tlv_header *ldp_tlv_header;
@@ -253,67 +254,73 @@ ldp_tlv_print(register const u_char *tptr) {
     char buf[100];
     int i;
 
     char buf[100];
     int i;
 
-    ldp_tlv_header = (const struct ldp_tlv_header *)tptr;    
-    tlv_len=EXTRACT_16BITS(ldp_tlv_header->length);
+    ldp_tlv_header = (const struct ldp_tlv_header *)tptr;
+    ND_TCHECK_SIZE(ldp_tlv_header);
+    tlv_len=GET_BE_U_2(ldp_tlv_header->length);
+    if (tlv_len + 4U > msg_tlen) {
+        ND_PRINT("\n\t\t TLV contents go past end of message");
+        return 0;
+    }
     tlv_tlen=tlv_len;
     tlv_tlen=tlv_len;
-    tlv_type=LDP_MASK_TLV_TYPE(EXTRACT_16BITS(ldp_tlv_header->type));
+    tlv_type=LDP_MASK_TLV_TYPE(GET_BE_U_2(ldp_tlv_header->type));
 
     /* FIXME vendor private / experimental check */
 
     /* FIXME vendor private / experimental check */
-    printf("\n\t    %s TLV (0x%04x), length: %u, Flags: [%s and %s forward if unknown]",
+    ND_PRINT("\n\t    %s TLV (0x%04x), length: %u, Flags: [%s and %s forward if unknown]",
            tok2str(ldp_tlv_values,
                    "Unknown",
                    tlv_type),
            tlv_type,
            tlv_len,
            tok2str(ldp_tlv_values,
                    "Unknown",
                    tlv_type),
            tlv_type,
            tlv_len,
-           LDP_MASK_U_BIT(EXTRACT_16BITS(&ldp_tlv_header->type)) ? "continue processing" : "ignore",
-           LDP_MASK_F_BIT(EXTRACT_16BITS(&ldp_tlv_header->type)) ? "do" : "don't");
+           LDP_MASK_U_BIT(GET_BE_U_2(ldp_tlv_header->type)) ? "continue processing" : "ignore",
+           LDP_MASK_F_BIT(GET_BE_U_2(ldp_tlv_header->type)) ? "do" : "don't");
 
     tptr+=sizeof(struct ldp_tlv_header);
 
     switch(tlv_type) {
 
     case LDP_TLV_COMMON_HELLO:
 
     tptr+=sizeof(struct ldp_tlv_header);
 
     switch(tlv_type) {
 
     case LDP_TLV_COMMON_HELLO:
-        printf("\n\t      Hold Time: %us, Flags: [%s Hello%s]",
-               EXTRACT_16BITS(tptr),
-               (EXTRACT_16BITS(tptr+2)&0x8000) ? "Targeted" : "Link",
-               (EXTRACT_16BITS(tptr+2)&0x4000) ? ", Request for targeted Hellos" : "");
+        TLV_TCHECK(4);
+        ND_PRINT("\n\t      Hold Time: %us, Flags: [%s Hello%s]",
+               GET_BE_U_2(tptr),
+               (GET_BE_U_2(tptr + 2)&0x8000) ? "Targeted" : "Link",
+               (GET_BE_U_2(tptr + 2)&0x4000) ? ", Request for targeted Hellos" : "");
         break;
 
     case LDP_TLV_IPV4_TRANSPORT_ADDR:
         break;
 
     case LDP_TLV_IPV4_TRANSPORT_ADDR:
-        printf("\n\t      IPv4 Transport Address: %s", ipaddr_string(tptr));
+        TLV_TCHECK(4);
+        ND_PRINT("\n\t      IPv4 Transport Address: %s", GET_IPADDR_STRING(tptr));
         break;
         break;
-#ifdef INET6
     case LDP_TLV_IPV6_TRANSPORT_ADDR:
     case LDP_TLV_IPV6_TRANSPORT_ADDR:
-        printf("\n\t      IPv6 Transport Address: %s", ip6addr_string(tptr));
+        TLV_TCHECK(16);
+        ND_PRINT("\n\t      IPv6 Transport Address: %s", GET_IP6ADDR_STRING(tptr));
         break;
         break;
-#endif
     case LDP_TLV_CONFIG_SEQ_NUMBER:
     case LDP_TLV_CONFIG_SEQ_NUMBER:
-        printf("\n\t      Sequence Number: %u", EXTRACT_32BITS(tptr));
+        TLV_TCHECK(4);
+        ND_PRINT("\n\t      Sequence Number: %u", GET_BE_U_4(tptr));
         break;
 
     case LDP_TLV_ADDRESS_LIST:
         break;
 
     case LDP_TLV_ADDRESS_LIST:
-       af = EXTRACT_16BITS(tptr);
+        TLV_TCHECK(LDP_TLV_ADDRESS_LIST_AFNUM_LEN);
+       af = GET_BE_U_2(tptr);
        tptr+=LDP_TLV_ADDRESS_LIST_AFNUM_LEN;
         tlv_tlen -= LDP_TLV_ADDRESS_LIST_AFNUM_LEN;
        tptr+=LDP_TLV_ADDRESS_LIST_AFNUM_LEN;
         tlv_tlen -= LDP_TLV_ADDRESS_LIST_AFNUM_LEN;
-       printf("\n\t      Address Family: %s, addresses",
+       ND_PRINT("\n\t      Address Family: %s, addresses",
                tok2str(af_values, "Unknown (%u)", af));
         switch (af) {
                tok2str(af_values, "Unknown (%u)", af));
         switch (af) {
-        case AFNUM_INET:
-           while(tlv_tlen >= sizeof(struct in_addr)) {
-               printf(" %s",ipaddr_string(tptr));
-               tlv_tlen-=sizeof(struct in_addr);
-               tptr+=sizeof(struct in_addr);                
+        case AFNUM_IP:
+           while(tlv_tlen >= sizeof(nd_ipv4)) {
+               ND_PRINT(" %s", GET_IPADDR_STRING(tptr));
+               tlv_tlen-=sizeof(nd_ipv4);
+               tptr+=sizeof(nd_ipv4);
            }
             break;
            }
             break;
-#ifdef INET6
-        case AFNUM_INET6:
-           while(tlv_tlen >= sizeof(struct in6_addr)) {
-               printf(" %s",ip6addr_string(tptr));
-               tlv_tlen-=sizeof(struct in6_addr);
-               tptr+=sizeof(struct in6_addr);                
+        case AFNUM_IP6:
+           while(tlv_tlen >= sizeof(nd_ipv6)) {
+               ND_PRINT(" %s", GET_IP6ADDR_STRING(tptr));
+               tlv_tlen-=sizeof(nd_ipv6);
+               tptr+=sizeof(nd_ipv6);
            }
             break;
            }
             break;
-#endif
         default:
             /* unknown AF */
             break;
         default:
             /* unknown AF */
             break;
@@ -321,94 +328,134 @@ ldp_tlv_print(register const u_char *tptr) {
        break;
 
     case LDP_TLV_COMMON_SESSION:
        break;
 
     case LDP_TLV_COMMON_SESSION:
-       printf("\n\t      Version: %u, Keepalive: %us, Flags: [Downstream %s, Loop Detection %s]",
-              EXTRACT_16BITS(tptr), EXTRACT_16BITS(tptr+2),
-              (EXTRACT_16BITS(tptr+6)&0x8000) ? "On Demand" : "Unsolicited",
-              (EXTRACT_16BITS(tptr+6)&0x4000) ? "Enabled" : "Disabled"
+       TLV_TCHECK(8);
+       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"
               );
        break;
 
     case LDP_TLV_FEC:
               );
        break;
 
     case LDP_TLV_FEC:
-        fec_type = *tptr;
-       printf("\n\t      %s FEC (0x%02x)",
+        TLV_TCHECK(1);
+        fec_type = GET_U_1(tptr);
+       ND_PRINT("\n\t      %s FEC (0x%02x)",
               tok2str(ldp_fec_values, "Unknown", fec_type),
               fec_type);
 
        tptr+=1;
               tok2str(ldp_fec_values, "Unknown", fec_type),
               fec_type);
 
        tptr+=1;
+       tlv_tlen-=1;
        switch(fec_type) {
 
        case LDP_FEC_WILDCARD:
            break;
        case LDP_FEC_PREFIX:
        switch(fec_type) {
 
        case LDP_FEC_WILDCARD:
            break;
        case LDP_FEC_PREFIX:
-           af = EXTRACT_16BITS(tptr);
+           TLV_TCHECK(2);
+           af = GET_BE_U_2(tptr);
            tptr+=2;
            tptr+=2;
-           if (af == AFNUM_INET) {
-               i=decode_prefix4(tptr,buf,sizeof(buf));
-               printf(": IPv4 prefix %s",buf);
-           }
-#ifdef INET6
-           else if (af == AFNUM_INET6) {
-               i=decode_prefix6(tptr,buf,sizeof(buf));
-               printf(": IPv6 prefix %s",buf);
-           }
-#endif
+           tlv_tlen-=2;
+           if (af == AFNUM_IP) {
+               i=decode_prefix4(ndo, tptr, tlv_tlen, buf, sizeof(buf));
+               if (i == -2)
+                   goto trunc;
+               if (i == -3)
+                   ND_PRINT(": IPv4 prefix (goes past end of TLV)");
+               else if (i == -1)
+                   ND_PRINT(": IPv4 prefix (invalid length)");
+               else
+                   ND_PRINT(": IPv4 prefix %s", buf);
+           } else if (af == AFNUM_IP6) {
+               i=decode_prefix6(ndo, tptr, tlv_tlen, buf, sizeof(buf));
+               if (i == -2)
+                   goto trunc;
+               if (i == -3)
+                   ND_PRINT(": IPv4 prefix (goes past end of TLV)");
+               else if (i == -1)
+                   ND_PRINT(": IPv6 prefix (invalid length)");
+               else
+                   ND_PRINT(": IPv6 prefix %s", buf);
+           } else
+               ND_PRINT(": Address family %u prefix", af);
            break;
        case LDP_FEC_HOSTADDRESS:
            break;
        case LDP_FEC_MARTINI_VC:
            break;
        case LDP_FEC_HOSTADDRESS:
            break;
        case LDP_FEC_MARTINI_VC:
-            if (!TTEST2(*tptr, 11))
-                goto trunc;
-            vc_info_len = *(tptr+2);
-
-           printf(": %s, %scontrol word, group-ID %u, VC-ID %u, VC-info-length: %u",
-                  tok2str(l2vpn_encaps_values, "Unknown", EXTRACT_16BITS(tptr)&0x7fff),
-                  EXTRACT_16BITS(tptr)&0x8000 ? "" : "no ",
-                   EXTRACT_32BITS(tptr+3),
-                  EXTRACT_32BITS(tptr+7),
-                   vc_info_len);
-
-            if (vc_info_len == 0) /* infinite loop protection */
+            /*
+             * We assume the type was supposed to be one of the MPLS
+             * Pseudowire Types.
+             */
+            TLV_TCHECK(7);
+            vc_info_len = GET_U_1(tptr + 2);
+
+            /*
+            * According to RFC 4908, the VC info Length field can be zero,
+            * in which case not only are there no interface parameters,
+            * there's no VC ID.
+            */
+            if (vc_info_len == 0) {
+                ND_PRINT(": %s, %scontrol word, group-ID %u, VC-info-length: %u",
+                       tok2str(mpls_pw_types_values, "Unknown", GET_BE_U_2(tptr)&0x7fff),
+                       GET_BE_U_2(tptr)&0x8000 ? "" : "no ",
+                       GET_BE_U_4(tptr + 3),
+                       vc_info_len);
                 break;
                 break;
+            }
+
+            /* Make sure we have the VC ID as well */
+            TLV_TCHECK(11);
+           ND_PRINT(": %s, %scontrol word, group-ID %u, VC-ID %u, VC-info-length: %u",
+                  tok2str(mpls_pw_types_values, "Unknown", GET_BE_U_2(tptr)&0x7fff),
+                  GET_BE_U_2(tptr)&0x8000 ? "" : "no ",
+                  GET_BE_U_4(tptr + 3),
+                  GET_BE_U_4(tptr + 7),
+                  vc_info_len);
+            if (vc_info_len < 4) {
+                /* minimum 4, for the VC ID */
+                ND_PRINT(" (invalid, < 4");
+                return(tlv_len+4); /* Type & Length fields not included */
+           }
+            vc_info_len -= 4; /* subtract out the VC ID, giving the length of the interface parameters */
 
 
+            /* Skip past the fixed information and the VC ID */
             tptr+=11;
             tptr+=11;
-            if (!TTEST2(*tptr, vc_info_len))
-                goto trunc;
+            tlv_tlen-=11;
+            TLV_TCHECK(vc_info_len);
 
             while (vc_info_len > 2) {
 
             while (vc_info_len > 2) {
-                vc_info_tlv_type = *tptr;
-                vc_info_tlv_len = *(tptr+1);
+                vc_info_tlv_type = GET_U_1(tptr);
+                vc_info_tlv_len = GET_U_1(tptr + 1);
                 if (vc_info_tlv_len < 2)
                     break;
                 if (vc_info_len < vc_info_tlv_len)
                     break;
 
                 if (vc_info_tlv_len < 2)
                     break;
                 if (vc_info_len < vc_info_tlv_len)
                     break;
 
-                printf("\n\t\tInterface Parameter: %s (0x%02x), len %u",
+                ND_PRINT("\n\t\tInterface Parameter: %s (0x%02x), len %u",
                        tok2str(ldp_fec_martini_ifparm_values,"Unknown",vc_info_tlv_type),
                        vc_info_tlv_type,
                        vc_info_tlv_len);
 
                 switch(vc_info_tlv_type) {
                 case LDP_FEC_MARTINI_IFPARM_MTU:
                        tok2str(ldp_fec_martini_ifparm_values,"Unknown",vc_info_tlv_type),
                        vc_info_tlv_type,
                        vc_info_tlv_len);
 
                 switch(vc_info_tlv_type) {
                 case LDP_FEC_MARTINI_IFPARM_MTU:
-                    printf(": %u",EXTRACT_16BITS(tptr+2));
+                    ND_PRINT(": %u", GET_BE_U_2(tptr + 2));
                     break;
 
                 case LDP_FEC_MARTINI_IFPARM_DESC:
                     break;
 
                 case LDP_FEC_MARTINI_IFPARM_DESC:
-                    printf(": ");
+                    ND_PRINT(": ");
                     for (idx = 2; idx < vc_info_tlv_len; idx++)
                     for (idx = 2; idx < vc_info_tlv_len; idx++)
-                        safeputchar(*(tptr+idx));
+                        fn_print_char(ndo, GET_U_1(tptr + idx));
                     break;
 
                 case LDP_FEC_MARTINI_IFPARM_VCCV:
                     break;
 
                 case LDP_FEC_MARTINI_IFPARM_VCCV:
-                    printf("\n\t\t  Control Channels (0x%02x) = [%s]",
-                           *(tptr+2),
-                           bittok2str(ldp_fec_martini_ifparm_vccv_cc_values,"none",*(tptr+2)));
-                    printf("\n\t\t  CV Types (0x%02x) = [%s]",
-                           *(tptr+3),
-                           bittok2str(ldp_fec_martini_ifparm_vccv_cv_values,"none",*(tptr+3)));
+                    ND_PRINT("\n\t\t  Control Channels (0x%02x) = [%s]",
+                           GET_U_1((tptr + 2)),
+                           bittok2str(ldp_fec_martini_ifparm_vccv_cc_values, "none", GET_U_1((tptr + 2))));
+                    ND_PRINT("\n\t\t  CV Types (0x%02x) = [%s]",
+                           GET_U_1((tptr + 3)),
+                           bittok2str(ldp_fec_martini_ifparm_vccv_cv_values, "none", GET_U_1((tptr + 3))));
                     break;
 
                 default:
                     break;
 
                 default:
-                    print_unknown_data(tptr+2,"\n\t\t  ",vc_info_tlv_len-2);
+                    print_unknown_data(ndo, tptr+2, "\n\t\t  ", vc_info_tlv_len-2);
                     break;
                 }
 
                     break;
                 }
 
@@ -421,42 +468,47 @@ ldp_tlv_print(register const u_char *tptr) {
        break;
 
     case LDP_TLV_GENERIC_LABEL:
        break;
 
     case LDP_TLV_GENERIC_LABEL:
-       printf("\n\t      Label: %u", EXTRACT_32BITS(tptr) & 0xfffff);
+       TLV_TCHECK(4);
+       ND_PRINT("\n\t      Label: %u", GET_BE_U_4(tptr) & 0xfffff);
        break;
 
     case LDP_TLV_STATUS:
        break;
 
     case LDP_TLV_STATUS:
-       ui = EXTRACT_32BITS(tptr);
+       TLV_TCHECK(8);
+       ui = GET_BE_U_4(tptr);
        tptr+=4;
        tptr+=4;
-       printf("\n\t      Status: 0x%02x, Flags: [%s and %s forward]",
+       ND_PRINT("\n\t      Status: 0x%02x, Flags: [%s and %s forward]",
               ui&0x3fffffff,
               ui&0x80000000 ? "Fatal error" : "Advisory Notification",
               ui&0x40000000 ? "do" : "don't");
               ui&0x3fffffff,
               ui&0x80000000 ? "Fatal error" : "Advisory Notification",
               ui&0x40000000 ? "do" : "don't");
-       ui = EXTRACT_32BITS(tptr);
+       ui = GET_BE_U_4(tptr);
        tptr+=4;
        if (ui)
        tptr+=4;
        if (ui)
-           printf(", causing Message ID: 0x%08x", ui);
+           ND_PRINT(", causing Message ID: 0x%08x", ui);
        break;
 
     case LDP_TLV_FT_SESSION:
        break;
 
     case LDP_TLV_FT_SESSION:
-       ft_flags = EXTRACT_16BITS(tptr);
-       printf("\n\t      Flags: [%sReconnect, %sSave State, %sAll-Label Protection, %s Checkpoint, %sRe-Learn State]",
+       TLV_TCHECK(12);
+       ft_flags = GET_BE_U_2(tptr);
+       ND_PRINT("\n\t      Flags: [%sReconnect, %sSave State, %sAll-Label Protection, %s Checkpoint, %sRe-Learn State]",
               ft_flags&0x8000 ? "" : "No ",
               ft_flags&0x8 ? "" : "Don't ",
               ft_flags&0x4 ? "" : "No ",
               ft_flags&0x2 ? "Sequence Numbered Label" : "All Labels",
               ft_flags&0x1 ? "" : "Don't ");
               ft_flags&0x8000 ? "" : "No ",
               ft_flags&0x8 ? "" : "Don't ",
               ft_flags&0x4 ? "" : "No ",
               ft_flags&0x2 ? "Sequence Numbered Label" : "All Labels",
               ft_flags&0x1 ? "" : "Don't ");
+       /* 16 bits (FT Flags) + 16 bits (Reserved) */
        tptr+=4;
        tptr+=4;
-       ui = EXTRACT_32BITS(tptr);
+       ui = GET_BE_U_4(tptr);
        if (ui)
        if (ui)
-           printf(", Reconnect Timeout: %ums", ui);
+           ND_PRINT(", Reconnect Timeout: %ums", ui);
        tptr+=4;
        tptr+=4;
-       ui = EXTRACT_32BITS(tptr);
+       ui = GET_BE_U_4(tptr);
        if (ui)
        if (ui)
-           printf(", Recovery Time: %ums", ui);
+           ND_PRINT(", Recovery Time: %ums", ui);
        break;
 
     case LDP_TLV_MTU:
        break;
 
     case LDP_TLV_MTU:
-       printf("\n\t      MTU: %u", EXTRACT_16BITS(tptr));
+       TLV_TCHECK(2);
+       ND_PRINT("\n\t      MTU: %u", GET_BE_U_2(tptr));
        break;
 
 
        break;
 
 
@@ -477,105 +529,130 @@ ldp_tlv_print(register const u_char *tptr) {
     case LDP_TLV_LABEL_REQUEST_MSG_ID:
 
     default:
     case LDP_TLV_LABEL_REQUEST_MSG_ID:
 
     default:
-        if (vflag <= 1)
-            print_unknown_data(tptr,"\n\t      ",tlv_tlen);
+        if (ndo->ndo_vflag <= 1)
+            print_unknown_data(ndo, tptr, "\n\t      ", tlv_tlen);
         break;
     }
     return(tlv_len+4); /* Type & Length fields not included */
         break;
     }
     return(tlv_len+4); /* Type & Length fields not included */
- 
+
 trunc:
 trunc:
-    printf("\n\t\t packet exceeded snapshot");
-    return 0;
+    nd_trunc_longjmp(ndo);
+
+invalid:
+    return(tlv_len+4); /* Type & Length fields not included */
 }
 
 void
 }
 
 void
-ldp_print(register const u_char *pptr, register u_int len) {
+ldp_print(netdissect_options *ndo,
+          const u_char *pptr, u_int len)
+{
+    u_int processed;
 
 
-    int processed;
+    ndo->ndo_protocol = "ldp";
     while (len > (sizeof(struct ldp_common_header) + sizeof(struct ldp_msg_header))) {
     while (len > (sizeof(struct ldp_common_header) + sizeof(struct ldp_msg_header))) {
-        processed = ldp_msg_print(pptr);
+        processed = ldp_pdu_print(ndo, pptr);
         if (processed == 0)
             return;
         if (processed == 0)
             return;
+        if (len < processed) {
+            ND_PRINT(" [remaining length %u < %u]", len, processed);
+            nd_print_invalid(ndo);
+            break;
+        }
         len -= processed;
         pptr += processed;
     }
 }
 
         len -= processed;
         pptr += processed;
     }
 }
 
-
-int
-ldp_msg_print(register const u_char *pptr) {
-
+static u_int
+ldp_pdu_print(netdissect_options *ndo,
+              const u_char *pptr)
+{
     const struct ldp_common_header *ldp_com_header;
     const struct ldp_msg_header *ldp_msg_header;
     const u_char *tptr,*msg_tptr;
     u_short tlen;
     const struct ldp_common_header *ldp_com_header;
     const struct ldp_msg_header *ldp_msg_header;
     const u_char *tptr,*msg_tptr;
     u_short tlen;
-    u_short pdu_len,msg_len,msg_type,msg_tlen;
+    u_short pdu_len,msg_len,msg_type;
+    u_int msg_tlen;
     int hexdump,processed;
 
     int hexdump,processed;
 
-    tptr=pptr;
     ldp_com_header = (const struct ldp_common_header *)pptr;
     ldp_com_header = (const struct ldp_common_header *)pptr;
-    TCHECK(*ldp_com_header);
+    ND_TCHECK_SIZE(ldp_com_header);
 
     /*
      * Sanity checking of the header.
      */
 
     /*
      * Sanity checking of the header.
      */
-    if (EXTRACT_16BITS(&ldp_com_header->version) != LDP_VERSION) {
-       printf("%sLDP version %u packet not supported",
-               (vflag < 1) ? "" : "\n\t",
-               EXTRACT_16BITS(&ldp_com_header->version));
+    if (GET_BE_U_2(ldp_com_header->version) != LDP_VERSION) {
+       ND_PRINT("%sLDP version %u packet not supported",
+               (ndo->ndo_vflag < 1) ? "" : "\n\t",
+               GET_BE_U_2(ldp_com_header->version));
        return 0;
     }
 
        return 0;
     }
 
+    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, < %zu)",
+                 (ndo->ndo_vflag < 1) ? "" : "\n\t",
+                 pdu_len,
+                 sizeof(struct ldp_common_header)-4);
+        return 0;
+    }
+
     /* print the LSR-ID, label-space & length */
     /* print the LSR-ID, label-space & length */
-    pdu_len = EXTRACT_16BITS(&ldp_com_header->pdu_length);
-    printf("%sLDP, Label-Space-ID: %s:%u, pdu-length: %u",
-           (vflag < 1) ? "" : "\n\t",
-           ipaddr_string(&ldp_com_header->lsr_id),
-           EXTRACT_16BITS(&ldp_com_header->label_space),
+    ND_PRINT("%sLDP, Label-Space-ID: %s:%u, pdu-length: %u",
+           (ndo->ndo_vflag < 1) ? "" : "\n\t",
+           GET_IPADDR_STRING(ldp_com_header->lsr_id),
+           GET_BE_U_2(ldp_com_header->label_space),
            pdu_len);
 
            pdu_len);
 
-    /* bail out if non-verbose */ 
-    if (vflag < 1)
+    /* bail out if non-verbose */
+    if (ndo->ndo_vflag < 1)
         return 0;
 
     /* ok they seem to want to know everything - lets fully decode it */
         return 0;
 
     /* ok they seem to want to know everything - lets fully decode it */
-    tlen=pdu_len;
-
-    tptr += sizeof(const struct ldp_common_header);
-    tlen -= sizeof(const struct ldp_common_header)-4;  /* Type & Length fields not included */
+    tptr = pptr + sizeof(struct ldp_common_header);
+    tlen = pdu_len - (sizeof(struct ldp_common_header)-4);     /* Type & Length fields not included */
 
     while(tlen>0) {
         /* did we capture enough for fully decoding the msg header ? */
 
     while(tlen>0) {
         /* did we capture enough for fully decoding the msg header ? */
-        if (!TTEST2(*tptr, sizeof(struct ldp_msg_header)))
-            goto trunc;
+        ND_TCHECK_LEN(tptr, sizeof(struct ldp_msg_header));
 
         ldp_msg_header = (const struct ldp_msg_header *)tptr;
 
         ldp_msg_header = (const struct ldp_msg_header *)tptr;
-        msg_len=EXTRACT_16BITS(ldp_msg_header->length);
-        msg_type=LDP_MASK_MSG_TYPE(EXTRACT_16BITS(ldp_msg_header->type));
+        msg_len=GET_BE_U_2(ldp_msg_header->length);
+        msg_type=LDP_MASK_MSG_TYPE(GET_BE_U_2(ldp_msg_header->type));
+
+        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, < %zu)",
+                     tok2str(ldp_msg_values,
+                             "Unknown",
+                             msg_type),
+                     msg_type,
+                     msg_len,
+                     sizeof(struct ldp_msg_header)-4);
+            return 0;
+        }
 
         /* FIXME vendor private / experimental check */
 
         /* FIXME vendor private / experimental check */
-        printf("\n\t  %s Message (0x%04x), length: %u, Message ID: 0x%08x, Flags: [%s if unknown]",
+        ND_PRINT("\n\t  %s Message (0x%04x), length: %u, Message ID: 0x%08x, Flags: [%s if unknown]",
                tok2str(ldp_msg_values,
                        "Unknown",
                        msg_type),
                msg_type,
                msg_len,
                tok2str(ldp_msg_values,
                        "Unknown",
                        msg_type),
                msg_type,
                msg_len,
-               EXTRACT_32BITS(&ldp_msg_header->id),
-               LDP_MASK_U_BIT(EXTRACT_16BITS(&ldp_msg_header->type)) ? "continue processing" : "ignore");
-
-        if (msg_len == 0) /* infinite loop protection */
-            return 0;
+               GET_BE_U_4(ldp_msg_header->id),
+               LDP_MASK_U_BIT(GET_BE_U_2(ldp_msg_header->type)) ? "continue processing" : "ignore");
 
         msg_tptr=tptr+sizeof(struct ldp_msg_header);
 
         msg_tptr=tptr+sizeof(struct ldp_msg_header);
-        msg_tlen=msg_len-sizeof(struct ldp_msg_header)+4; /* Type & Length fields not included */
+        msg_tlen=msg_len-(sizeof(struct ldp_msg_header)-4); /* Type & Length fields not included */
 
         /* did we capture enough for fully decoding the message ? */
 
         /* did we capture enough for fully decoding the message ? */
-        if (!TTEST2(*tptr, msg_len))
-            goto trunc;
+        ND_TCHECK_LEN(tptr, msg_len);
         hexdump=FALSE;
 
         switch(msg_type) {
         hexdump=FALSE;
 
         switch(msg_type) {
- 
+
         case LDP_MSG_NOTIF:
         case LDP_MSG_HELLO:
         case LDP_MSG_INIT:
         case LDP_MSG_NOTIF:
         case LDP_MSG_HELLO:
         case LDP_MSG_INIT:
@@ -585,7 +662,7 @@ ldp_msg_print(register const u_char *pptr) {
         case LDP_MSG_ADDRESS_WITHDRAW:
         case LDP_MSG_LABEL_WITHDRAW:
             while(msg_tlen >= 4) {
         case LDP_MSG_ADDRESS_WITHDRAW:
         case LDP_MSG_LABEL_WITHDRAW:
             while(msg_tlen >= 4) {
-                processed = ldp_tlv_print(msg_tptr);
+                processed = ldp_tlv_print(ndo, msg_tptr, msg_tlen);
                 if (processed == 0)
                     break;
                 msg_tlen-=processed;
                 if (processed == 0)
                     break;
                 msg_tlen-=processed;
@@ -603,13 +680,13 @@ ldp_msg_print(register const u_char *pptr) {
         case LDP_MSG_LABEL_ABORT_REQUEST:
 
         default:
         case LDP_MSG_LABEL_ABORT_REQUEST:
 
         default:
-            if (vflag <= 1)
-                print_unknown_data(msg_tptr,"\n\t  ",msg_tlen);
+            if (ndo->ndo_vflag <= 1)
+                print_unknown_data(ndo, msg_tptr, "\n\t  ", msg_tlen);
             break;
         }
         /* do we want to see an additionally hexdump ? */
             break;
         }
         /* do we want to see an additionally hexdump ? */
-        if (vflag > 1 || hexdump==TRUE)
-            print_unknown_data(tptr+sizeof(struct ldp_msg_header),"\n\t  ",
+        if (ndo->ndo_vflag > 1 || hexdump==TRUE)
+            print_unknown_data(ndo, tptr+sizeof(struct ldp_msg_header), "\n\t  ",
                                msg_len);
 
         tptr += msg_len+4;
                                msg_len);
 
         tptr += msg_len+4;
@@ -617,7 +694,5 @@ ldp_msg_print(register const u_char *pptr) {
     }
     return pdu_len+4;
 trunc:
     }
     return pdu_len+4;
 trunc:
-    printf("\n\t\t packet exceeded snapshot");
-    return 0;
+    nd_trunc_longjmp(ndo);
 }
 }
-
[mirror] the TCPdump network dissector