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 39128eba1618a2c6c4db549813104e498982b21c..57d8f9f8f8a51fd80f59841d1cf16bc1f95d2166 100644 (file)
--- a/print-pim.c
+++ b/print-pim.c
@@ -20,19 +20,15 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.29 2001-07-04 21:36:15 fenner 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
 #include "config.h"
 #endif
 
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>

 
 /*
  * XXX: We consider a case where IPv6 is not ready yet for portability,
 
 /*
  * XXX: We consider a case where IPv6 is not ready yet for portability,


@@ -56,7 +52,6 @@ struct pim {
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

-#include <unistd.h>

 
 #include "interface.h"
 #include "addrtoname.h"
 
 #include "interface.h"
 #include "addrtoname.h"


@@ -127,7 +122,7 @@ pimv1_join_prune_print(register const u_char *bp, register u_int len)
                bp += 12;
                len -= 12;
                for (njp = 0; njp < (njoin + nprune); njp++) {
                bp += 12;
                len -= 12;
                for (njp = 0; njp < (njoin + nprune); njp++) {

-                       char *type;
+                       const char *type;

 
                        if (njp < njoin)
                                type = "Join ";
 
                        if (njp < njoin)
                                type = "Join ";


@@ -447,7 +442,7 @@ static int
 pimv2_addr_print(const u_char *bp, enum pimv2_addrtype at, int silent)
 {
        int af;
 pimv2_addr_print(const u_char *bp, enum pimv2_addrtype at, int silent)
 {
        int af;

-       char *afstr;
+       const char *afstr;

        int len, hdrlen;
 
        TCHECK(bp[0]);
        int len, hdrlen;
 
        TCHECK(bp[0]);


@@ -584,7 +579,36 @@ pimv2_print(register const u_char *bp, register u_int len)
                                (void)printf(")");
                                break;
 
                                (void)printf(")");
                                break;
 

+                       case 2:         /* LAN Prune Delay */
+                               (void)printf(" (LAN-Prune-Delay: ");
+                               if (olen != 4) {
+                                       (void)printf("!olen=%d!)", olen);
+                               } else {
+                                       char t_bit;
+                                       u_int16_t lan_delay, override_interval;
+                                       lan_delay = EXTRACT_16BITS(&bp[4]);
+                                       override_interval = EXTRACT_16BITS(&bp[6]);
+                                       t_bit = (lan_delay & 0x8000)? 1 : 0;
+                                       lan_delay &= ~0x8000;
+                                       (void)printf("T-bit=%d lan-delay=%dms override-interval=%dms)",
+                                       t_bit, lan_delay, override_interval);
+                               }
+                               break;
+
+                       case 18:        /* Old DR-Priority */
+                               if (olen == 4)
+                                       (void)printf(" (OLD-DR-Priority: %d)",
+                                                       EXTRACT_32BITS(&bp[4]));
+                               else
+                                       goto unknown;
+                               break;
+
+

                        case 19:        /* DR-Priority */
                        case 19:        /* DR-Priority */

+                               if (olen == 0) {
+                                       (void)printf(" (OLD-bidir-capable)");
+                                       break;
+                               }

                                (void)printf(" (DR-Priority: ");
                                if (olen != 4) {
                                        (void)printf("!olen=%d!)", olen);
                                (void)printf(" (DR-Priority: ");
                                if (olen != 4) {
                                        (void)printf("!olen=%d!)", olen);


@@ -613,7 +637,28 @@ pimv2_print(register const u_char *bp, register u_int len)
                                (void)printf(" (bidir-capable)");
                                break;
 
                                (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:
                        default:

+                       unknown:

                                if (vflag)
                                        (void)printf(" [Hello option %d]", otype);
                        }
                                if (vflag)
                                        (void)printf(" [Hello option %d]", otype);
                        }