pflog: Include <limits.h> for UINT_MAX

[tcpdump] / print-ldp.c

diff --git a/print-ldp.c b/print-ldp.c
index b75b36199d8db84df4bb1d3bb1199fae7ecadb04..b16e989f2912d3c7347c3e84b97d4ae946ffde00 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"
 


@@ -29,7 +27,6 @@
 #include "l2vpn.h"
 #include "af.h"
 
 #include "l2vpn.h"
 #include "af.h"
 

-

 /*
  * ldp common header
  *
 /*
  * ldp common header
  *


@@ -275,13 +272,6 @@ static u_int ldp_pdu_print(netdissect_options *, const u_char *);
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
 
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
 

-#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,
 static u_int
 ldp_tlv_print(netdissect_options *ndo,
               const u_char *tptr,


@@ -324,7 +314,7 @@ ldp_tlv_print(netdissect_options *ndo,
     switch(tlv_type) {
 
     case LDP_TLV_COMMON_HELLO:
     switch(tlv_type) {
 
     case LDP_TLV_COMMON_HELLO:

-        TLV_TCHECK(4);
+        ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 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",
         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",


@@ -332,20 +322,21 @@ ldp_tlv_print(netdissect_options *ndo,
         break;
 
     case LDP_TLV_IPV4_TRANSPORT_ADDR:
         break;
 
     case LDP_TLV_IPV4_TRANSPORT_ADDR:

-        TLV_TCHECK(4);
+        ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);

         ND_PRINT("\n\t      IPv4 Transport Address: %s", GET_IPADDR_STRING(tptr));
         break;
     case LDP_TLV_IPV6_TRANSPORT_ADDR:
         ND_PRINT("\n\t      IPv4 Transport Address: %s", GET_IPADDR_STRING(tptr));
         break;
     case LDP_TLV_IPV6_TRANSPORT_ADDR:

-        TLV_TCHECK(16);
+        ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 16);

         ND_PRINT("\n\t      IPv6 Transport Address: %s", GET_IP6ADDR_STRING(tptr));
         break;
     case LDP_TLV_CONFIG_SEQ_NUMBER:
         ND_PRINT("\n\t      IPv6 Transport Address: %s", GET_IP6ADDR_STRING(tptr));
         break;
     case LDP_TLV_CONFIG_SEQ_NUMBER:

-        TLV_TCHECK(4);
+        ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);

         ND_PRINT("\n\t      Sequence Number: %u", GET_BE_U_4(tptr));
         break;
 
     case LDP_TLV_ADDRESS_LIST:
         ND_PRINT("\n\t      Sequence Number: %u", GET_BE_U_4(tptr));
         break;
 
     case LDP_TLV_ADDRESS_LIST:

-        TLV_TCHECK(LDP_TLV_ADDRESS_LIST_AFNUM_LEN);
+        ND_ICHECKMSG_U("tlv length", tlv_tlen, <,
+                       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;
        af = GET_BE_U_2(tptr);
        tptr+=LDP_TLV_ADDRESS_LIST_AFNUM_LEN;
         tlv_tlen -= LDP_TLV_ADDRESS_LIST_AFNUM_LEN;


@@ -373,12 +364,12 @@ ldp_tlv_print(netdissect_options *ndo,
        break;
 
     case LDP_TLV_HOP_COUNT:
        break;
 
     case LDP_TLV_HOP_COUNT:

-       TLV_TCHECK(1);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 1);

        ND_PRINT("\n\t      Hop Count: %u", GET_U_1(tptr));
        break;
 
     case LDP_TLV_PATH_VECTOR:
        ND_PRINT("\n\t      Hop Count: %u", GET_U_1(tptr));
        break;
 
     case LDP_TLV_PATH_VECTOR:

-       TLV_TCHECK(4);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);

        ND_PRINT("\n\t      Path Vector: %s", GET_IPADDR_STRING(tptr));
        tptr += 4;
        tlv_tlen -= 4;
        ND_PRINT("\n\t      Path Vector: %s", GET_IPADDR_STRING(tptr));
        tptr += 4;
        tlv_tlen -= 4;


@@ -390,7 +381,7 @@ ldp_tlv_print(netdissect_options *ndo,
        break;
 
     case LDP_TLV_COMMON_SESSION:
        break;
 
     case LDP_TLV_COMMON_SESSION:

-       TLV_TCHECK(14);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 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 + 4)&0x8000) ? "On Demand" : "Unsolicited",
        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 + 4)&0x8000) ? "On Demand" : "Unsolicited",


@@ -405,7 +396,7 @@ ldp_tlv_print(netdissect_options *ndo,
        break;
 
     case LDP_TLV_FEC:
        break;
 
     case LDP_TLV_FEC:

-        TLV_TCHECK(1);
+        ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 1);

         fec_type = GET_U_1(tptr);
        ND_PRINT("\n\t      %s FEC (0x%02x)",
               tok2str(ldp_fec_values, "Unknown", fec_type),
         fec_type = GET_U_1(tptr);
        ND_PRINT("\n\t      %s FEC (0x%02x)",
               tok2str(ldp_fec_values, "Unknown", fec_type),


@@ -418,7 +409,7 @@ ldp_tlv_print(netdissect_options *ndo,
        case LDP_FEC_WILDCARD:
            break;
        case LDP_FEC_PREFIX:
        case LDP_FEC_WILDCARD:
            break;
        case LDP_FEC_PREFIX:

-           TLV_TCHECK(2);
+           ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 2);

            af = GET_BE_U_2(tptr);
            tptr+=2;
            tlv_tlen-=2;
            af = GET_BE_U_2(tptr);
            tptr+=2;
            tlv_tlen-=2;


@@ -452,7 +443,7 @@ ldp_tlv_print(netdissect_options *ndo,
              * We assume the type was supposed to be one of the MPLS
              * Pseudowire Types.
              */
              * We assume the type was supposed to be one of the MPLS
              * Pseudowire Types.
              */

-            TLV_TCHECK(7);
+            ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 7);

             vc_info_len = GET_U_1(tptr + 2);
 
             /*
             vc_info_len = GET_U_1(tptr + 2);
 
             /*


@@ -470,7 +461,7 @@ ldp_tlv_print(netdissect_options *ndo,
             }
 
             /* Make sure we have the VC ID as well */
             }
 
             /* Make sure we have the VC ID as well */

-            TLV_TCHECK(11);
+            ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 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 ",
            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 ",


@@ -487,7 +478,7 @@ ldp_tlv_print(netdissect_options *ndo,
             /* Skip past the fixed information and the VC ID */
             tptr+=11;
             tlv_tlen-=11;
             /* Skip past the fixed information and the VC ID */
             tptr+=11;
             tlv_tlen-=11;

-            TLV_TCHECK(vc_info_len);
+            ND_ICHECKMSG_U("tlv length", tlv_tlen, <, vc_info_len);

 
             while (vc_info_len > 2) {
                 vc_info_tlv_type = GET_U_1(tptr);
 
             while (vc_info_len > 2) {
                 vc_info_tlv_type = GET_U_1(tptr);


@@ -536,12 +527,12 @@ ldp_tlv_print(netdissect_options *ndo,
        break;
 
     case LDP_TLV_GENERIC_LABEL:
        break;
 
     case LDP_TLV_GENERIC_LABEL:

-       TLV_TCHECK(4);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);

        ND_PRINT("\n\t      Label: %u", GET_BE_U_4(tptr) & 0xfffff);
        break;
 
     case LDP_TLV_STATUS:
        ND_PRINT("\n\t      Label: %u", GET_BE_U_4(tptr) & 0xfffff);
        break;
 
     case LDP_TLV_STATUS:

-       TLV_TCHECK(10);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 10);

        ui = GET_BE_U_4(tptr);
        tptr+=4;
        ND_PRINT("\n\t      Status Code: %s, Flags: [%s and %s forward]",
        ui = GET_BE_U_4(tptr);
        tptr+=4;
        ND_PRINT("\n\t      Status Code: %s, Flags: [%s and %s forward]",


@@ -554,12 +545,11 @@ ldp_tlv_print(netdissect_options *ndo,
            ND_PRINT(", causing Message ID: 0x%08x", ui);
        ui = GET_BE_U_2(tptr);
        if (ui)
            ND_PRINT(", causing Message ID: 0x%08x", ui);
        ui = GET_BE_U_2(tptr);
        if (ui)

-           ND_PRINT(", Message ID: %s", tok2str(ldp_msg_values, "Unknown", ui));
-
+           ND_PRINT(", Message Type: %s", tok2str(ldp_msg_values, "Unknown", ui));

        break;
 
     case LDP_TLV_FT_SESSION:
        break;
 
     case LDP_TLV_FT_SESSION:

-       TLV_TCHECK(12);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 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 = 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 ",


@@ -579,17 +569,17 @@ ldp_tlv_print(netdissect_options *ndo,
        break;
 
     case LDP_TLV_TYPED_WC_FEC_CAP:
        break;
 
     case LDP_TLV_TYPED_WC_FEC_CAP:

-       TLV_TCHECK(1);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 1);

        ND_PRINT("\n\t      %s", GET_U_1(tptr)&0x80 ? "Support" : "No Support");
        break;
 
     case LDP_TLV_MTU:
        ND_PRINT("\n\t      %s", GET_U_1(tptr)&0x80 ? "Support" : "No Support");
        break;
 
     case LDP_TLV_MTU:

-       TLV_TCHECK(2);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 2);

        ND_PRINT("\n\t      MTU: %u", GET_BE_U_2(tptr));
        break;
 
     case LDP_TLV_DUAL_STACK_CAP:
        ND_PRINT("\n\t      MTU: %u", GET_BE_U_2(tptr));
        break;
 
     case LDP_TLV_DUAL_STACK_CAP:

-       TLV_TCHECK(4);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);

        transport_pref = GET_U_1(tptr);
        ND_PRINT("\n\t      Transport Connection Preference: %s",
                 tok2str(ldp_dual_stack_transport_pref_values,
        transport_pref = GET_U_1(tptr);
        ND_PRINT("\n\t      Transport Connection Preference: %s",
                 tok2str(ldp_dual_stack_transport_pref_values,


@@ -597,7 +587,6 @@ ldp_tlv_print(netdissect_options *ndo,
                         transport_pref));
        break;
 
                         transport_pref));
        break;
 

-

     /*
      *  FIXME those are the defined TLVs that lack a decoder
      *  you are welcome to contribute code ;-)
     /*
      *  FIXME those are the defined TLVs that lack a decoder
      *  you are welcome to contribute code ;-)


@@ -623,6 +612,7 @@ trunc:
     nd_trunc_longjmp(ndo);
 
 invalid:
     nd_trunc_longjmp(ndo);
 
 invalid:

+    nd_print_invalid(ndo);

     return(tlv_len+4); /* Type & Length fields not included */
 }
 
     return(tlv_len+4); /* Type & Length fields not included */
 }
 


@@ -697,7 +687,7 @@ ldp_pdu_print(netdissect_options *ndo,
     tptr = pptr + sizeof(struct ldp_common_header);
     tlen = pdu_len - (sizeof(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) {
+    while(tlen != 0) {

         /* did we capture enough for fully decoding the msg header ? */
         ND_TCHECK_LEN(tptr, sizeof(struct ldp_msg_header));
 
         /* did we capture enough for fully decoding the msg header ? */
         ND_TCHECK_LEN(tptr, sizeof(struct ldp_msg_header));