Use "len", not "payload_len", as we step through the packet; use

[tcpdump] / print-pim.c

diff --git a/print-pim.c b/print-pim.c
index ac6891d5b4fcb7cdbf42b55c73f52f9e8db6c1f0..57d8f9f8f8a51fd80f59841d1cf16bc1f95d2166 100644 (file)
--- a/print-pim.c
+++ b/print-pim.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.35 2002-11-09 17:19:28 itojun Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.39 2003-11-16 09:36:32 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -47,7 +47,7 @@ struct pim {
 #define PIM_TYPE(x)    ((x) & 0x0f)
        u_char  pim_rsv;        /* Reserved */
        u_short pim_cksum;      /* IP style check sum */
-} __attribute__((packed));
+};
 
 
 #include <stdio.h>
@@ -637,6 +637,26 @@ pimv2_print(register const u_char *bp, register u_int len)
                                (void)printf(" (bidir-capable)");
                                break;
 
+                       case 24:        /* Address List */
+                       case 65001:     /* Address List (old implementations) */
+                               (void)printf(" (%saddr-list",
+                                            otype == 65001 ? "old" : "");
+                               if (vflag > 1) {
+                                       const u_char *ptr = &bp[4];
+                                       while (ptr < &bp[4 + olen]) {
+                                               int advance;
+
+                                               printf(" ");
+                                               advance = pimv2_addr_print(ptr, pimv2_unicast, 0);
+                                               if (advance < 0) {
+                                                       printf("...");
+                                                       break;
+                                               }
+                                               ptr += advance;
+                                       }
+                               }
+                               (void)printf(")");
+                               break;
                        default:
                        unknown:
                                if (vflag)