Fix tpyo.

[tcpdump] / print-ldp.c

diff --git a/print-ldp.c b/print-ldp.c
index 87805d2465437525e6c36155e4fe4d7ec021d84e..49379f0dac7e1a8ba56896b9f16edaff8f8a88f4 100644 (file)
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -211,7 +211,7 @@ static const struct tok ldp_fec_martini_ifparm_vccv_cv_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-static int ldp_pdu_print(netdissect_options *, const u_char *);
+static u_int ldp_pdu_print(netdissect_options *, const u_char *);

 
 /*
  * ldp tlv header
 
 /*
  * ldp tlv header


@@ -233,10 +233,10 @@ static int ldp_pdu_print(netdissect_options *, const u_char *);
 #define TLV_TCHECK(minlen) \
     ND_TCHECK_LEN(tptr, minlen); if (tlv_tlen < minlen) goto badtlv;
 
 #define TLV_TCHECK(minlen) \
     ND_TCHECK_LEN(tptr, minlen); if (tlv_tlen < minlen) goto badtlv;
 

-static int
+static u_int

 ldp_tlv_print(netdissect_options *ndo,
               const u_char *tptr,
 ldp_tlv_print(netdissect_options *ndo,
               const u_char *tptr,

-              u_short msg_tlen)
+              u_int msg_tlen)

 {
     struct ldp_tlv_header {
         nd_uint16_t type;
 {
     struct ldp_tlv_header {
         nd_uint16_t type;


@@ -253,7 +253,7 @@ ldp_tlv_print(netdissect_options *ndo,
     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);
     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 + 4 > msg_tlen) {
+    if (tlv_len + 4U > msg_tlen) {

         ND_PRINT("\n\t\t TLV contents go past end of message");
         return 0;
     }
         ND_PRINT("\n\t\t TLV contents go past end of message");
         return 0;
     }


@@ -547,19 +547,24 @@ void
 ldp_print(netdissect_options *ndo,
           const u_char *pptr, u_int len)
 {
 ldp_print(netdissect_options *ndo,
           const u_char *pptr, u_int len)
 {

-    int processed;
+    u_int processed;

 
     ndo->ndo_protocol = "ldp";
     while (len > (sizeof(struct ldp_common_header) + sizeof(struct ldp_msg_header))) {
         processed = ldp_pdu_print(ndo, pptr);
         if (processed == 0)
             return;
 
     ndo->ndo_protocol = "ldp";
     while (len > (sizeof(struct ldp_common_header) + sizeof(struct ldp_msg_header))) {
         processed = ldp_pdu_print(ndo, pptr);
         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;
     }
 }
 

-static int
+static u_int

 ldp_pdu_print(netdissect_options *ndo,
               const u_char *pptr)
 {
 ldp_pdu_print(netdissect_options *ndo,
               const u_char *pptr)
 {


@@ -567,7 +572,8 @@ ldp_pdu_print(netdissect_options *ndo,
     const struct ldp_msg_header *ldp_msg_header;
     const u_char *tptr,*msg_tptr;
     u_short tlen;
     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;
 
     ldp_com_header = (const struct ldp_common_header *)pptr;
     int hexdump,processed;
 
     ldp_com_header = (const struct ldp_common_header *)pptr;