From Carles Kishimoto <[email protected]>:

[tcpdump] / print-ldp.c

diff --git a/print-ldp.c b/print-ldp.c
index 560fdb6ae4c226d5a5acb7c7e868b448ad3875e4..c05c75c53a3e18fd5b8abc68d75f8cdec3052685 100644 (file)
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -16,7 +16,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ldp.c,v 1.8.2.4 2005-05-03 08:23:07 hannes Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ldp.c,v 1.8.2.9 2006-06-23 02:07:27 hannes Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -116,7 +116,7 @@ static const struct tok ldp_msg_values[] = {
     { LDP_MSG_INIT,                 "Initialization" },
     { LDP_MSG_KEEPALIVE,             "Keepalive" },
     { LDP_MSG_ADDRESS,              "Address" },
-    { LDP_MSG_ADDRESS_WITHDRAW,             "Address Widthdraw" },
+    { LDP_MSG_ADDRESS_WITHDRAW,             "Address Withdraw" },
     { LDP_MSG_LABEL_MAPPING,        "Label Mapping" },
     { LDP_MSG_LABEL_REQUEST,        "Label Request" },
     { LDP_MSG_LABEL_WITHDRAW,       "Label Withdraw" },
@@ -215,11 +215,10 @@ static const struct tok ldp_fec_martini_ifparm_vccv_cv_values[] = {
 };
 
 /* RFC1700 address family numbers, same definition in print-bgp.c */
+/* FIXME: move all AF stuff into dedicated files */
 #define AFNUM_INET     1
 #define AFNUM_INET6    2
-
-#define FALSE 0
-#define TRUE  1
+#define AFNUM_LEN       2 
 
 int ldp_msg_print(register const u_char *);
 int ldp_tlv_print(register const u_char *);
@@ -296,21 +295,24 @@ ldp_tlv_print(register const u_char *tptr) {
 
     case LDP_TLV_ADDRESS_LIST:
        af = EXTRACT_16BITS(tptr);
-       tptr+=2;
-       printf("\n\t      Adress Family: ");
+       tptr+=AFNUM_LEN;
+        tlv_tlen -= AFNUM_LEN;
+       printf("\n\t      Address Family: ");
        if (af == AFNUM_INET) {
            printf("IPv4, addresses:");
-           for (i=0; i<(tlv_tlen-2)/4; i++) {
+           while(tlv_tlen >= sizeof(struct in_addr)) {
                printf(" %s",ipaddr_string(tptr));
-               tptr+=4;
+               tlv_tlen-=sizeof(struct in_addr);
+               tptr+=sizeof(struct in_addr);                
            }
        }
 #ifdef INET6
        else if (af == AFNUM_INET6) {
            printf("IPv6, addresses:");
-           for (i=0; i<(tlv_tlen-2)/16; i++) {
+           while(tlv_tlen >= sizeof(struct in6_addr)) {
                printf(" %s",ip6addr_string(tptr));
-               tptr+=16;
+               tlv_tlen-=sizeof(struct in6_addr);
+               tptr+=sizeof(struct in6_addr);                
            }
        }
 #endif
@@ -375,6 +377,8 @@ ldp_tlv_print(register const u_char *tptr) {
                 vc_info_tlv_len = *(tptr+1);
                 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",
                        tok2str(ldp_fec_martini_ifparm_values,"Unknown",vc_info_tlv_type),
@@ -572,6 +576,8 @@ ldp_msg_print(register const u_char *pptr) {
         case LDP_MSG_KEEPALIVE:
         case LDP_MSG_ADDRESS:
         case LDP_MSG_LABEL_MAPPING:
+        case LDP_MSG_ADDRESS_WITHDRAW:
+        case LDP_MSG_LABEL_WITHDRAW:
             while(msg_tlen >= 4) {
                 processed = ldp_tlv_print(msg_tptr);
                 if (processed == 0)
@@ -586,9 +592,7 @@ ldp_msg_print(register const u_char *pptr) {
          *  you are welcome to contribute code ;-)
          */
 
-        case LDP_MSG_ADDRESS_WITHDRAW:
         case LDP_MSG_LABEL_REQUEST:
-        case LDP_MSG_LABEL_WITHDRAW:
         case LDP_MSG_LABEL_RELEASE:
         case LDP_MSG_LABEL_ABORT_REQUEST: