]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-pim.c
Address Michael's comments.
[tcpdump] / print-pim.c
index 5c8d2230f4ede3017aecdcb296a5af1772c68585..e0cca125f675f95fce9145a4882b7fe426bc9c50 100644 (file)
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.15 1999-12-14 16:58:03 fenner Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.49 2006-02-13 01:31:35 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
+#include <tcpdump-stdinc.h>
 
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-/*
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
-*/
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "interface.h"
+#include "addrtoname.h"
+#include "extract.h"
+
+#include "ip.h"
+
+#define PIMV2_TYPE_HELLO         0
+#define PIMV2_TYPE_REGISTER      1
+#define PIMV2_TYPE_REGISTER_STOP 2
+#define PIMV2_TYPE_JOIN_PRUNE    3
+#define PIMV2_TYPE_BOOTSTRAP     4
+#define PIMV2_TYPE_ASSERT        5
+#define PIMV2_TYPE_GRAFT         6
+#define PIMV2_TYPE_GRAFT_ACK     7
+#define PIMV2_TYPE_CANDIDATE_RP  8
+#define PIMV2_TYPE_PRUNE_REFRESH 9
+
+static struct tok pimv2_type_values[] = {
+    { PIMV2_TYPE_HELLO,         "Hello" },
+    { PIMV2_TYPE_REGISTER,      "Register" },
+    { PIMV2_TYPE_REGISTER_STOP, "Register Stop" },
+    { PIMV2_TYPE_JOIN_PRUNE,    "Join / Prune" },
+    { PIMV2_TYPE_BOOTSTRAP,     "Bootstrap" },
+    { PIMV2_TYPE_ASSERT,        "Assert" },
+    { PIMV2_TYPE_GRAFT,         "Graft" },
+    { PIMV2_TYPE_GRAFT_ACK,     "Graft Acknowledgement" },
+    { PIMV2_TYPE_CANDIDATE_RP,  "Candidate RP Advertisement" },
+    { PIMV2_TYPE_PRUNE_REFRESH, "Prune Refresh" },
+    { 0, NULL}
+};
+
+#define PIMV2_HELLO_OPTION_HOLDTIME             1
+#define PIMV2_HELLO_OPTION_LANPRUNEDELAY        2
+#define PIMV2_HELLO_OPTION_DR_PRIORITY_OLD     18
+#define PIMV2_HELLO_OPTION_DR_PRIORITY         19
+#define PIMV2_HELLO_OPTION_GENID               20
+#define PIMV2_HELLO_OPTION_REFRESH_CAP         21
+#define PIMV2_HELLO_OPTION_BIDIR_CAP           22
+#define PIMV2_HELLO_OPTION_ADDRESS_LIST        24
+#define PIMV2_HELLO_OPTION_ADDRESS_LIST_OLD 65001
+
+static struct tok pimv2_hello_option_values[] = {
+    { PIMV2_HELLO_OPTION_HOLDTIME,         "Hold Time" },
+    { PIMV2_HELLO_OPTION_LANPRUNEDELAY,    "LAN Prune Delay" },
+    { PIMV2_HELLO_OPTION_DR_PRIORITY_OLD,  "DR Priority (Old)" },
+    { PIMV2_HELLO_OPTION_DR_PRIORITY,      "DR Priority" },
+    { PIMV2_HELLO_OPTION_GENID,            "Generation ID" },
+    { PIMV2_HELLO_OPTION_REFRESH_CAP,      "State Refresh Capability" },
+    { PIMV2_HELLO_OPTION_BIDIR_CAP,        "Bi-Directional Capability" },
+    { PIMV2_HELLO_OPTION_ADDRESS_LIST,     "Address List" },
+    { PIMV2_HELLO_OPTION_ADDRESS_LIST_OLD, "Address List (Old)" },
+    { 0, NULL}
+};
+
+#define PIMV2_REGISTER_FLAG_LEN      4
+#define PIMV2_REGISTER_FLAG_BORDER 0x80000000
+#define PIMV2_REGISTER_FLAG_NULL   0x40000000
+
+static struct tok pimv2_register_flag_values[] = {
+    { PIMV2_REGISTER_FLAG_BORDER, "Border" },
+    { PIMV2_REGISTER_FLAG_NULL, "Null" },
+    { 0, NULL}
+};    
 
 /*
  * XXX: We consider a case where IPv6 is not ready yet for portability,
  * but PIM dependent defintions should be independent of IPv6...
  */
-#ifdef INET6
-#include <netinet6/pim6.h>
-#else
+
 struct pim {
-#if defined(WORDS_BIGENDIAN) || (defined(BYTE_ORDER) && (BYTE_ORDER == LITTLE_ENDIAN))
-       u_int   pim_type:4, /* the PIM message type, currently they are:
-                           * Hello, Register, Register-Stop, Join/Prune,
-                           * Bootstrap, Assert, Graft (PIM-DM only),
-                           * Graft-Ack (PIM-DM only), C-RP-Adv
-                           */
-               pim_ver:4;  /* PIM version number; 2 for PIMv2 */
-#else
-       u_int   pim_ver:4,      /* PIM version */
-               pim_type:4;     /* PIM type    */
-#endif
+       u_int8_t pim_typever;
+                       /* upper 4bit: PIM version number; 2 for PIMv2 */
+                       /* lower 4bit: the PIM message type, currently they are:
+                        * Hello, Register, Register-Stop, Join/Prune,
+                        * Bootstrap, Assert, Graft (PIM-DM only),
+                        * Graft-Ack (PIM-DM only), C-RP-Adv
+                        */
+#define PIM_VER(x)     (((x) & 0xf0) >> 4)
+#define PIM_TYPE(x)    ((x) & 0x0f)
        u_char  pim_rsv;        /* Reserved */
        u_short pim_cksum;      /* IP style check sum */
 };
-#endif 
 
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "interface.h"
-#include "addrtoname.h"
-#include "extract.h"
-
-static void pimv2_print(register const u_char *bp, register u_int len);
+static void pimv2_print(register const u_char *bp, register u_int len, u_int cksum);
 
 static void
 pimv1_join_prune_print(register const u_char *bp, register u_int len)
 {
-    int maddrlen, addrlen, ngroups, njoin, nprune;
-    int njp;
-
-    /* If it's a single group and a single source, use 1-line output. */
-    if (TTEST2(bp[0], 30) && bp[11] == 1 &&
-       ((njoin = EXTRACT_16BITS(&bp[20])) + EXTRACT_16BITS(&bp[22])) == 1) {
-           int hold;
-
-           (void)printf(" RPF %s ", ipaddr_string(bp));
-           hold = EXTRACT_16BITS(&bp[6]);
-           if (hold != 180) {
-               (void)printf("Hold ");
-               relts_print(hold);
-           }
-           (void)printf("%s (%s/%d, %s", njoin ? "Join" : "Prune",
-                   ipaddr_string(&bp[26]), bp[25] & 0x3f,
-                   ipaddr_string(&bp[12]));
-           if (EXTRACT_32BITS(&bp[16]) != 0xffffffff)
-                   (void)printf("/%s", ipaddr_string(&bp[16]));
-           (void)printf(") %s%s %s",
+       int maddrlen, addrlen, ngroups, njoin, nprune;
+       int njp;
+
+       /* If it's a single group and a single source, use 1-line output. */
+       if (TTEST2(bp[0], 30) && bp[11] == 1 &&
+           ((njoin = EXTRACT_16BITS(&bp[20])) + EXTRACT_16BITS(&bp[22])) == 1) {
+               int hold;
+
+               (void)printf(" RPF %s ", ipaddr_string(bp));
+               hold = EXTRACT_16BITS(&bp[6]);
+               if (hold != 180) {
+                       (void)printf("Hold ");
+                       relts_print(hold);
+               }
+               (void)printf("%s (%s/%d, %s", njoin ? "Join" : "Prune",
+               ipaddr_string(&bp[26]), bp[25] & 0x3f,
+               ipaddr_string(&bp[12]));
+               if (EXTRACT_32BITS(&bp[16]) != 0xffffffff)
+                       (void)printf("/%s", ipaddr_string(&bp[16]));
+               (void)printf(") %s%s %s",
                    (bp[24] & 0x01) ? "Sparse" : "Dense",
                    (bp[25] & 0x80) ? " WC" : "",
                    (bp[25] & 0x40) ? "RP" : "SPT");
-           return;
-    }
-       
-    TCHECK2(bp[0], 4);
-    (void)printf("\n Upstream Nbr: %s", ipaddr_string(bp));
-    TCHECK2(bp[6], 2);
-    (void)printf("\n Hold time: ");
-    relts_print(EXTRACT_16BITS(&bp[6]));
-    bp += 8; len -= 8;
-
-    TCHECK2(bp[0], 4);
-    maddrlen = bp[1];
-    addrlen = bp[2];
-    ngroups = bp[3];
-    bp += 4; len -= 4;
-    while (ngroups--) {
+               return;
+       }
+
+       TCHECK2(bp[0], sizeof(struct in_addr));
+       if (vflag > 1)
+               (void)printf("\n");
+       (void)printf(" Upstream Nbr: %s", ipaddr_string(bp));
+       TCHECK2(bp[6], 2);
+       if (vflag > 1)
+               (void)printf("\n");
+       (void)printf(" Hold time: ");
+       relts_print(EXTRACT_16BITS(&bp[6]));
+       if (vflag < 2)
+               return;
+       bp += 8;
+       len -= 8;
+
        TCHECK2(bp[0], 4);
-       (void)printf("\n\tGroup: %s", ipaddr_string(bp));
-       if (EXTRACT_32BITS(&bp[4]) != 0xffffffff)
-               (void)printf("/%s", ipaddr_string(&bp[4]));
-       TCHECK2(bp[8], 4);
-       njoin = EXTRACT_16BITS(&bp[8]);
-       nprune = EXTRACT_16BITS(&bp[10]);
-       (void)printf(" joined: %d pruned: %d", njoin, nprune);
-       bp += 12; len -= 12;
-       for (njp = 0; njp < (njoin + nprune); njp++) {
-           char *type;
-
-           if (njp < njoin) {
-               type = "Join ";
-           } else {
-               type = "Prune";
-           }
-           TCHECK2(bp[0], 6);
-           (void)printf("\n\t%s %s%s%s%s/%d", type,
+       maddrlen = bp[1];
+       addrlen = bp[2];
+       ngroups = bp[3];
+       bp += 4;
+       len -= 4;
+       while (ngroups--) {
+               /*
+                * XXX - does the address have length "addrlen" and the
+                * mask length "maddrlen"?
+                */
+               TCHECK2(bp[0], sizeof(struct in_addr));
+               (void)printf("\n\tGroup: %s", ipaddr_string(bp));
+               TCHECK2(bp[4], sizeof(struct in_addr));
+               if (EXTRACT_32BITS(&bp[4]) != 0xffffffff)
+                       (void)printf("/%s", ipaddr_string(&bp[4]));
+               TCHECK2(bp[8], 4);
+               njoin = EXTRACT_16BITS(&bp[8]);
+               nprune = EXTRACT_16BITS(&bp[10]);
+               (void)printf(" joined: %d pruned: %d", njoin, nprune);
+               bp += 12;
+               len -= 12;
+               for (njp = 0; njp < (njoin + nprune); njp++) {
+                       const char *type;
+
+                       if (njp < njoin)
+                               type = "Join ";
+                       else
+                               type = "Prune";
+                       TCHECK2(bp[0], 6);
+                       (void)printf("\n\t%s %s%s%s%s/%d", type,
                            (bp[0] & 0x01) ? "Sparse " : "Dense ",
                            (bp[1] & 0x80) ? "WC " : "",
                            (bp[1] & 0x40) ? "RP " : "SPT ",
-                           ipaddr_string(&bp[2]), bp[1] & 0x3f);
-           bp += 6; len -= 6;
+                       ipaddr_string(&bp[2]), bp[1] & 0x3f);
+                       bp += 6;
+                       len -= 6;
+               }
        }
-    }
-    return;
+       return;
 trunc:
-    (void)printf("[|pim]");
-    return;
+       (void)printf("[|pim]");
+       return;
 }
 
 void
 pimv1_print(register const u_char *bp, register u_int len)
 {
-    register const u_char *ep;
-    register u_char type;
+       register const u_char *ep;
+       register u_char type;
 
-    ep = (const u_char *)snapend;
-    if (bp >= ep)
-       return;
+       ep = (const u_char *)snapend;
+       if (bp >= ep)
+               return;
 
-    type = bp[1];
+       TCHECK(bp[1]);
+       type = bp[1];
 
-    switch (type) {
-    case 0:
-       (void)printf(" Query");
-       if (TTEST(bp[8])) {
-               switch (bp[8] >> 4) {
-                   case 0:     (void)printf(" Dense-mode");
+       switch (type) {
+       case 0:
+               (void)printf(" Query");
+               if (TTEST(bp[8])) {
+                       switch (bp[8] >> 4) {
+                       case 0:
+                               (void)printf(" Dense-mode");
                                break;
-                   case 1:     (void)printf(" Sparse-mode");
+                       case 1:
+                               (void)printf(" Sparse-mode");
                                break;
-                   case 2:     (void)printf(" Sparse-Dense-mode");
+                       case 2:
+                               (void)printf(" Sparse-Dense-mode");
                                break;
-                   default:    (void)printf(" mode-%d", bp[8] >> 4);
+                       default:
+                               (void)printf(" mode-%d", bp[8] >> 4);
                                break;
+                       }
                }
-       }
-       if (vflag) {
-           TCHECK2(bp[10],2);
-           (void)printf(" (Hold-time ");
-           relts_print(EXTRACT_16BITS(&bp[10]));
-           (void)printf(")");
-       }
-       break;
-
-    case 1:
-       (void)printf(" Register");
-       TCHECK2(bp[8], 20);                     /* ip header */
-       (void)printf(" for %s > %s", ipaddr_string(&bp[20]),
-                                    ipaddr_string(&bp[24]));
-       break;
-
-    case 2:
-       (void)printf(" Register-Stop");
-       TCHECK2(bp[12], 4);
-       (void)printf(" for %s > %s", ipaddr_string(&bp[8]),
-                                    ipaddr_string(&bp[12]));
-       break;
-
-    case 3:
-       (void)printf(" Join/Prune");
-       if (vflag) {
-           pimv1_join_prune_print(&bp[8], len - 8);
-       }
-       break;
+               if (vflag) {
+                       TCHECK2(bp[10],2);
+                       (void)printf(" (Hold-time ");
+                       relts_print(EXTRACT_16BITS(&bp[10]));
+                       (void)printf(")");
+               }
+               break;
 
-    case 4:
-       (void)printf(" RP-reachable");
-       if (vflag) {
-               TCHECK2(bp[22], 2);
-               (void)printf(" group %s",
+       case 1:
+               (void)printf(" Register");
+               TCHECK2(bp[8], 20);                     /* ip header */
+               (void)printf(" for %s > %s", ipaddr_string(&bp[20]),
+                   ipaddr_string(&bp[24]));
+               break;
+       case 2:
+               (void)printf(" Register-Stop");
+               TCHECK2(bp[12], sizeof(struct in_addr));
+               (void)printf(" for %s > %s", ipaddr_string(&bp[8]),
+                   ipaddr_string(&bp[12]));
+               break;
+       case 3:
+               (void)printf(" Join/Prune");
+               if (vflag)
+                       pimv1_join_prune_print(&bp[8], len - 8);
+               break;
+       case 4:
+               (void)printf(" RP-reachable");
+               if (vflag) {
+                       TCHECK2(bp[22], 2);
+                       (void)printf(" group %s",
                        ipaddr_string(&bp[8]));
+                       if (EXTRACT_32BITS(&bp[12]) != 0xffffffff)
+                               (void)printf("/%s", ipaddr_string(&bp[12]));
+                       (void)printf(" RP %s hold ", ipaddr_string(&bp[16]));
+                       relts_print(EXTRACT_16BITS(&bp[22]));
+               }
+               break;
+       case 5:
+               (void)printf(" Assert");
+               TCHECK2(bp[16], sizeof(struct in_addr));
+               (void)printf(" for %s > %s", ipaddr_string(&bp[16]),
+                   ipaddr_string(&bp[8]));
                if (EXTRACT_32BITS(&bp[12]) != 0xffffffff)
                        (void)printf("/%s", ipaddr_string(&bp[12]));
-               (void)printf(" RP %s hold ",
-                       ipaddr_string(&bp[16]));
-               relts_print(EXTRACT_16BITS(&bp[22]));
-       }
-       break;
-
-    case 5:
-       (void)printf(" Assert");
-       TCHECK2(bp[16], 4);
-       (void)printf(" for %s > %s", ipaddr_string(&bp[16]),
-                                           ipaddr_string(&bp[8]));
-       if (EXTRACT_32BITS(&bp[12]) != 0xffffffff)
-               (void)printf("/%s", ipaddr_string(&bp[12]));
-       TCHECK2(bp[24], 4);
-       (void)printf(" %s pref %d metric %d",
-               (bp[20] & 0x80) ? "RP-tree" : "SPT",
+               TCHECK2(bp[24], 4);
+               (void)printf(" %s pref %d metric %d",
+                   (bp[20] & 0x80) ? "RP-tree" : "SPT",
                EXTRACT_32BITS(&bp[20]) & 0x7fffffff,
                EXTRACT_32BITS(&bp[24]));
-       break;
-
-    case 6:
-       (void)printf(" Graft");
-       if (vflag) {
-           pimv1_join_prune_print(&bp[8], len - 8);
-       }
-       break;
-
-    case 7:
-       (void)printf(" Graft-ACK");
-       if (vflag) {
-           pimv1_join_prune_print(&bp[8], len - 8);
+               break;
+       case 6:
+               (void)printf(" Graft");
+               if (vflag)
+                       pimv1_join_prune_print(&bp[8], len - 8);
+               break;
+       case 7:
+               (void)printf(" Graft-ACK");
+               if (vflag)
+                       pimv1_join_prune_print(&bp[8], len - 8);
+               break;
+       case 8:
+               (void)printf(" Mode");
+               break;
+       default:
+               (void)printf(" [type %d]", type);
+               break;
        }
-       break;
-
-    case 8:
-       (void)printf(" Mode");
-       break;
-
-    default:
-       (void)printf(" [type %d]", type);
-       break;
-    }
-    if ((bp[4] >> 4) != 1)
-       (void)printf(" [v%d]", bp[4] >> 4);
-    return;
+       if ((bp[4] >> 4) != 1)
+               (void)printf(" [v%d]", bp[4] >> 4);
+       return;
 
 trunc:
-    (void)printf("[|pim]");
-    return;
+       (void)printf("[|pim]");
+       return;
 }
 
 /*
  * auto-RP is a cisco protocol, documented at
- * ftp://ftpeng.cisco.com/ipmulticast/pim-autorp-spec01.txt
+ * ftp://ftpeng.cisco.com/ipmulticast/specs/pim-autorp-spec01.txt
+ *
+ * This implements version 1+, dated Sept 9, 1998.
  */
 void
 cisco_autorp_print(register const u_char *bp, register u_int len)
 {
-    int type;
-    int numrps;
-    int hold;
-
-    TCHECK(bp[0]);
-    (void)printf(" auto-rp ");
-    type = bp[0];
-    switch (type) {
-    case 0x11:
-       (void)printf("candidate-advert");
-       break;
-    case 0x12:
-       (void)printf("mapping");
-       break;
-    default:
-       (void)printf("type-0x%02x", type);
-       break;
-    }
-
-    TCHECK(bp[1]);
-    numrps = bp[1];
-
-    TCHECK2(bp[2], 2);
-    (void)printf(" Hold ");
-    hold = EXTRACT_16BITS(&bp[2]);
-    if (hold)
-       relts_print(EXTRACT_16BITS(&bp[2]));
-    else
-       printf("FOREVER");
-
-    /* Next 4 bytes are reserved. */
-
-    bp += 8; len -= 8;
-
-    /*XXX skip unless -v? */
-
-    /*
-     * Rest of packet:
-     * numrps entries of the form:
-     * 32 bits: RP
-     * 6 bits: reserved
-     * 2 bits: PIM version supported, bit 0 is "supports v1", 1 is "v2".
-     * 8 bits: # of entries for this RP
-     * each entry: 7 bits: reserved, 1 bit: negative,
-     *                 8 bits: mask 32 bits: source
-     * lather, rinse, repeat.
-     */
-    while (numrps--) {
-       int nentries;
-       char s;
+       int type;
+       int numrps;
+       int hold;
 
-       TCHECK2(bp[0], 4);
-       (void)printf(" RP %s", ipaddr_string(bp));
-       TCHECK(bp[4]);
-       switch(bp[4] & 0x3) {
-       case 0: printf(" PIMv?");
-               break;
-       case 1: printf(" PIMv1");
+       TCHECK(bp[0]);
+       (void)printf(" auto-rp ");
+       type = bp[0];
+       switch (type) {
+       case 0x11:
+               (void)printf("candidate-advert");
                break;
-       case 2: printf(" PIMv2");
+       case 0x12:
+               (void)printf("mapping");
                break;
-       case 3: printf(" PIMv1+2");
+       default:
+               (void)printf("type-0x%02x", type);
                break;
        }
-       TCHECK(bp[5]);
-       nentries = bp[5];
-       bp += 6; len -= 6;
-       s = ' ';
-       for (; nentries; nentries--) {
-           TCHECK2(bp[0], 6);
-           (void)printf("%c%s%s/%d", s, bp[0] & 1 ? "!" : "",
-                                       ipaddr_string(&bp[2]), bp[1]);
-           s = ',';
-           bp += 6; len -= 6;
+
+       TCHECK(bp[1]);
+       numrps = bp[1];
+
+       TCHECK2(bp[2], 2);
+       (void)printf(" Hold ");
+       hold = EXTRACT_16BITS(&bp[2]);
+       if (hold)
+               relts_print(EXTRACT_16BITS(&bp[2]));
+       else
+               printf("FOREVER");
+
+       /* Next 4 bytes are reserved. */
+
+       bp += 8; len -= 8;
+
+       /*XXX skip unless -v? */
+
+       /*
+        * Rest of packet:
+        * numrps entries of the form:
+        * 32 bits: RP
+        * 6 bits: reserved
+        * 2 bits: PIM version supported, bit 0 is "supports v1", 1 is "v2".
+        * 8 bits: # of entries for this RP
+        * each entry: 7 bits: reserved, 1 bit: negative,
+        *             8 bits: mask 32 bits: source
+        * lather, rinse, repeat.
+        */
+       while (numrps--) {
+               int nentries;
+               char s;
+
+               TCHECK2(bp[0], 4);
+               (void)printf(" RP %s", ipaddr_string(bp));
+               TCHECK(bp[4]);
+               switch (bp[4] & 0x3) {
+               case 0: printf(" PIMv?");
+                       break;
+               case 1: printf(" PIMv1");
+                       break;
+               case 2: printf(" PIMv2");
+                       break;
+               case 3: printf(" PIMv1+2");
+                       break;
+               }
+               if (bp[4] & 0xfc)
+                       (void)printf(" [rsvd=0x%02x]", bp[4] & 0xfc);
+               TCHECK(bp[5]);
+               nentries = bp[5];
+               bp += 6; len -= 6;
+               s = ' ';
+               for (; nentries; nentries--) {
+                       TCHECK2(bp[0], 6);
+                       (void)printf("%c%s%s/%d", s, bp[0] & 1 ? "!" : "",
+                           ipaddr_string(&bp[2]), bp[1]);
+                       if (bp[0] & 0x02) {
+                           (void)printf(" bidir");
+                       }
+                       if (bp[0] & 0xfc) {
+                           (void)printf("[rsvd=0x%02x]", bp[0] & 0xfc);
+                       }
+                       s = ',';
+                       bp += 6; len -= 6;
+               }
        }
-    }
-    return;
+       return;
 
 trunc:
-    (void)printf("[|autorp]");
-    return;
+       (void)printf("[|autorp]");
+       return;
 }
 
 void
-pim_print(register const u_char *bp, register u_int len)
+pim_print(register const u_char *bp, register u_int len, u_int cksum)
 {
        register const u_char *ep;
        register struct pim *pim = (struct pim *)bp;
@@ -369,13 +427,26 @@ pim_print(register const u_char *bp, register u_int len)
        TCHECK(pim->pim_rsv);
 #endif
 
-       switch(pim->pim_ver) {
-        case 2:                /* avoid hardcoding? */
-               (void)printf("v2");
-               pimv2_print(bp, len);
-               break;
-        default:
-               (void)printf("v%d", pim->pim_ver);
+       switch (PIM_VER(pim->pim_typever)) {
+       case 2:
+            if (!vflag) {
+                printf("PIMv%u, %s, length %u",
+                       PIM_VER(pim->pim_typever),
+                       tok2str(pimv2_type_values,"Unknown Type",PIM_TYPE(pim->pim_typever)),
+                       len);
+                return;
+            } else {
+                printf("PIMv%u, length %u\n\t%s",
+                       PIM_VER(pim->pim_typever),
+                       len,
+                       tok2str(pimv2_type_values,"Unknown Type",PIM_TYPE(pim->pim_typever)));
+                pimv2_print(bp, len, cksum);
+            }
+            break;
+       default:
+               printf("PIMv%u, length %u",
+                       PIM_VER(pim->pim_typever),
+                       len);
                break;
        }
        return;
@@ -426,11 +497,6 @@ static int pimv2_addr_len;
 enum pimv2_addrtype {
        pimv2_unicast, pimv2_group, pimv2_source
 };
-#if 0
-static char *addrtypestr[] = {
-       "unicast", "group", "source"
-};
-#endif
 
 /*  0                   1                   2                   3
  *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -456,7 +522,6 @@ static int
 pimv2_addr_print(const u_char *bp, enum pimv2_addrtype at, int silent)
 {
        int af;
-       char *afstr;
        int len, hdrlen;
 
        TCHECK(bp[0]);
@@ -464,19 +529,17 @@ pimv2_addr_print(const u_char *bp, enum pimv2_addrtype at, int silent)
        if (pimv2_addr_len == 0) {
                TCHECK(bp[1]);
                switch (bp[0]) {
-                case 1:
+               case 1:
                        af = AF_INET;
-                       afstr = "IPv4";
-                       len = 4;
+                       len = sizeof(struct in_addr);
                        break;
 #ifdef INET6
-                case 2:
+               case 2:
                        af = AF_INET6;
-                       afstr = "IPv6";
-                       len = 16;
+                       len = sizeof(struct in6_addr);
                        break;
 #endif
-                default:
+               default:
                        return -1;
                }
                if (bp[1] != 0)
@@ -484,17 +547,15 @@ pimv2_addr_print(const u_char *bp, enum pimv2_addrtype at, int silent)
                hdrlen = 2;
        } else {
                switch (pimv2_addr_len) {
-                case 4:
+               case sizeof(struct in_addr):
                        af = AF_INET;
-                       afstr = "IPv4";
                        break;
 #ifdef INET6
-                case 16:
+               case sizeof(struct in6_addr):
                        af = AF_INET6;
-                       afstr = "IPv6";
                        break;
 #endif
-                default:
+               default:
                        return -1;
                        break;
                }
@@ -504,7 +565,7 @@ pimv2_addr_print(const u_char *bp, enum pimv2_addrtype at, int silent)
 
        bp += hdrlen;
        switch (at) {
-        case pimv2_unicast:
+       case pimv2_unicast:
                TCHECK2(bp[0], len);
                if (af == AF_INET) {
                        if (!silent)
@@ -517,8 +578,8 @@ pimv2_addr_print(const u_char *bp, enum pimv2_addrtype at, int silent)
                }
 #endif
                return hdrlen + len;
-        case pimv2_group:
-        case pimv2_source:
+       case pimv2_group:
+       case pimv2_source:
                TCHECK2(bp[0], len + 2);
                if (af == AF_INET) {
                        if (!silent) {
@@ -559,7 +620,7 @@ trunc:
 }
 
 static void
-pimv2_print(register const u_char *bp, register u_int len)
+pimv2_print(register const u_char *bp, register u_int len, u_int cksum)
 {
        register const u_char *ep;
        register struct pim *pim = (struct pim *)bp;
@@ -568,101 +629,158 @@ pimv2_print(register const u_char *bp, register u_int len)
        ep = (const u_char *)snapend;
        if (bp >= ep)
                return;
+       if (ep > bp + len)
+               ep = bp + len;
        TCHECK(pim->pim_rsv);
        pimv2_addr_len = pim->pim_rsv;
        if (pimv2_addr_len != 0)
-               (void)printf("[RFC2117-encoding] ");
+               (void)printf(", RFC2117-encoding");
 
-       switch (pim->pim_type) {
-        case 0:
+        printf(", cksum 0x%04x ", EXTRACT_16BITS(&pim->pim_cksum));
+        if (EXTRACT_16BITS(&pim->pim_cksum) == 0) {
+                printf("(unverified)");
+        } else {
+                printf("(%scorrect)", TTEST2(bp[0], len) && cksum ? "in" : "" );
+        }
+
+       switch (PIM_TYPE(pim->pim_typever)) {
+       case PIMV2_TYPE_HELLO:
            {
                u_int16_t otype, olen;
-               (void)printf(" Hello");
                bp += 4;
                while (bp < ep) {
                        TCHECK2(bp[0], 4);
                        otype = EXTRACT_16BITS(&bp[0]);
                        olen = EXTRACT_16BITS(&bp[2]);
                        TCHECK2(bp[0], 4 + olen);
+
+                        printf("\n\t  %s Option (%u), length %u, Value: ",
+                               tok2str( pimv2_hello_option_values,"Unknown",otype),
+                               otype,
+                               olen);
+                       bp += 4;
+
                        switch (otype) {
-                       case 1:         /* Hold time */
-                               (void)printf(" (Hold-time ");
-                               relts_print(EXTRACT_16BITS(&bp[4]));
-                               (void)printf(")");
+                       case PIMV2_HELLO_OPTION_HOLDTIME:
+                                relts_print(EXTRACT_16BITS(bp));
+                                break;
+
+                       case PIMV2_HELLO_OPTION_LANPRUNEDELAY:
+                               if (olen != 4) {
+                                       (void)printf("ERROR: Option Length != 4 Bytes (%u)", olen);
+                               } else {
+                                       char t_bit;
+                                       u_int16_t lan_delay, override_interval;
+                                       lan_delay = EXTRACT_16BITS(bp);
+                                       override_interval = EXTRACT_16BITS(bp+2);
+                                       t_bit = (lan_delay & 0x8000)? 1 : 0;
+                                       lan_delay &= ~0x8000;
+                                       (void)printf("\n\t    T-bit=%d, LAN delay %dms, Override interval %dms",
+                                       t_bit, lan_delay, override_interval);
+                               }
                                break;
 
-                       /* XXX
-                        * draft-ietf-idmr-pimv2-dr-priority-00.txt
-                        * says that DR-Priority is option 19.
-                        * draft-ietf-pim-v2-sm-00.txt says it's 18.
-                        */
-                       case 18:        /* DR-Priority */
-                               (void)printf(" (DR-Priority: %d)", EXTRACT_32BITS(&bp[4]));
+                       case PIMV2_HELLO_OPTION_DR_PRIORITY_OLD:
+                       case PIMV2_HELLO_OPTION_DR_PRIORITY:
+                                switch (olen) {
+                                case 0:
+                                    printf("Bi-Directional Capability (Old)");
+                                    break;
+                                case 4:
+                                    printf("%u", EXTRACT_32BITS(bp));
+                                    break;
+                                default:
+                                    printf("ERROR: Option Length != 4 Bytes (%u)", olen);
+                                    break;
+                                }
+                                break;
+
+                       case PIMV2_HELLO_OPTION_GENID:
+                                (void)printf("0x%08x", EXTRACT_32BITS(bp));
                                break;
 
-                       case 19:        /* Bidir-Capable */
-                               if (olen == 4)
-                                       (void)printf(" (OLD-DR-Priority: %d)", EXTRACT_32BITS(&bp[4]));
-                               else
-                                       (void)printf(" (bidir-capable)");
+                       case PIMV2_HELLO_OPTION_REFRESH_CAP:
+                                (void)printf("v%d", *bp);
+                               if (*(bp+1) != 0) {
+                                    (void)printf(", interval ");
+                                    relts_print(*(bp+1));
+                               }
+                               if (EXTRACT_16BITS(bp+2) != 0) {
+                                    (void)printf(" ?0x%04x?", EXTRACT_16BITS(bp+2));
+                               }
                                break;
 
-                       case 20:
-                               (void)printf(" (Genid: 0x%08x)", EXTRACT_32BITS(&bp[4]));
+                       case  PIMV2_HELLO_OPTION_BIDIR_CAP:
                                break;
 
-                       case 21:
-                               (void)printf(" (State Refresh Capable");
-                               if (EXTRACT_32BITS(&bp[4]) != 1) {
-                                       (void)printf(" ?0x%x?", EXTRACT_32BITS(&bp[4]));
+                        case PIMV2_HELLO_OPTION_ADDRESS_LIST_OLD:
+                        case PIMV2_HELLO_OPTION_ADDRESS_LIST:
+                               if (vflag > 1) {
+                                       const u_char *ptr = bp;
+                                       while (ptr < (bp+olen)) {
+                                               int advance;
+
+                                               printf("\n\t    ");
+                                               advance = pimv2_addr_print(ptr, pimv2_unicast, 0);
+                                               if (advance < 0) {
+                                                       printf("...");
+                                                       break;
+                                               }
+                                               ptr += advance;
+                                       }
                                }
-                               (void)printf(")");
                                break;
-
                        default:
-                               if (vflag)
-                                       (void)printf(" [Hello option %d]", otype);
+                                if (vflag <= 1)
+                                    print_unknown_data(bp,"\n\t    ",olen);
+                                break;
                        }
-                       bp += 4 + olen;
+                        /* do we want to see an additionally hexdump ? */
+                        if (vflag> 1)
+                            print_unknown_data(bp,"\n\t    ",olen);
+                       bp += olen;
                }
                break;
            }
 
-        case 1:
-        {
+       case PIMV2_TYPE_REGISTER:
+       {
                struct ip *ip;
 
-               (void)printf(" Register");
-               if (vflag && bp + 8 <= ep) {
-                       (void)printf(" %s%s", bp[4] & 0x80 ? "B" : "",
-                               bp[4] & 0x40 ? "N" : "");
-               }
-               bp += 8; len -= 8;
+                if (!TTEST2(*(bp+4), PIMV2_REGISTER_FLAG_LEN))
+                        goto trunc;
+
+                printf(", Flags [ %s ]\n\t",
+                       tok2str(pimv2_register_flag_values,
+                               "none",
+                               EXTRACT_32BITS(bp+4)));
 
+               bp += 8; len -= 8;
                /* encapsulated multicast packet */
-               if (bp >= ep)
-                       break;
                ip = (struct ip *)bp;
-               switch(ip->ip_v) {
-                case 4:        /* IPv4 */
-                       printf(" ");
-                       ip_print(bp, len);
+               switch (IP_V(ip)) {
+                case 0: /* Null header */
+                       (void)printf("IP-Null-header %s > %s",
+                                     ipaddr_string(&ip->ip_src),
+                                     ipaddr_string(&ip->ip_dst));
+                       break;
+
+               case 4: /* IPv4 */
+                       ip_print(gndo, bp, len);
                        break;
 #ifdef INET6
-                case 6:        /* IPv6 */
-                       printf(" ");
-                       ip6_print(bp, len);
+               case 6: /* IPv6 */
+                       ip6_print(gndo, bp, len);
                        break;
 #endif
-                default:
-                       (void)printf(" IP ver %d", ip->ip_v);
-                       break;
+                default:
+                        (void)printf("IP ver %d", IP_V(ip));
+                        break;
                }
                break;
-        }
+       }
 
-        case 2:
-               (void)printf(" Register-Stop");
+       case PIMV2_TYPE_REGISTER_STOP:
                bp += 4; len -= 4;
                if (bp >= ep)
                        break;
@@ -682,9 +800,46 @@ pimv2_print(register const u_char *bp, register u_int len)
                bp += advance; len -= advance;
                break;
 
-        case 3:
-        case 6:
-        case 7:
+       case PIMV2_TYPE_JOIN_PRUNE:
+       case PIMV2_TYPE_GRAFT:
+       case PIMV2_TYPE_GRAFT_ACK:
+
+
+        /*
+         * 0                   1                   2                   3
+         *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+         *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         *  |PIM Ver| Type  | Addr length   |           Checksum            |
+         *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         *  |             Unicast-Upstream Neighbor Address                 |
+         *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         *  |  Reserved     | Num groups    |          Holdtime             |
+         *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         *  |            Encoded-Multicast Group Address-1                  |
+         *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         *  |   Number of Joined  Sources   |   Number of Pruned Sources    |
+         *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         *  |               Encoded-Joined Source Address-1                 |
+         *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         *  |                             .                                 |
+         *  |                             .                                 |
+         *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         *  |               Encoded-Joined Source Address-n                 |
+         *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         *  |               Encoded-Pruned Source Address-1                 |
+         *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         *  |                             .                                 |
+         *  |                             .                                 |
+         *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         *  |               Encoded-Pruned Source Address-n                 |
+         *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         *  |                           .                                   |
+         *  |                           .                                   |
+         *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         *  |                Encoded-Multicast Group Address-n              |
+         *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         */
+
            {
                u_int8_t ngroup;
                u_int16_t holdtime;
@@ -692,22 +847,11 @@ pimv2_print(register const u_char *bp, register u_int len)
                u_int16_t nprune;
                int i, j;
 
-               switch (pim->pim_type) {
-                case 3:
-                       (void)printf(" Join/Prune");
-                       break;
-                case 6:
-                       (void)printf(" Graft");
-                       break;
-                case 7:
-                       (void)printf(" Graft-ACK");
-                       break;
-               }
                bp += 4; len -= 4;
-               if (pim->pim_type != 7) {       /*not for Graft-ACK*/
+               if (PIM_TYPE(pim->pim_typever) != 7) {  /*not for Graft-ACK*/
                        if (bp >= ep)
                                break;
-                       (void)printf(" upstream-neighbor=");
+                       (void)printf(", upstream-neighbor: ");
                        if ((advance = pimv2_addr_print(bp, pimv2_unicast, 0)) < 0) {
                                (void)printf("...");
                                break;
@@ -718,11 +862,11 @@ pimv2_print(register const u_char *bp, register u_int len)
                        break;
                ngroup = bp[1];
                holdtime = EXTRACT_16BITS(&bp[2]);
-               (void)printf(" groups=%u", ngroup);
-               if (pim->pim_type != 7) {       /*not for Graft-ACK*/
-                       (void)printf(" holdtime=");
+               (void)printf("\n\t  %u group(s)", ngroup);
+               if (PIM_TYPE(pim->pim_typever) != 7) {  /*not for Graft-ACK*/
+                       (void)printf(", holdtime: ");
                        if (holdtime == 0xffff)
-                               (void)printf("infty");
+                               (void)printf("infinite");
                        else
                                relts_print(holdtime);
                }
@@ -730,7 +874,7 @@ pimv2_print(register const u_char *bp, register u_int len)
                for (i = 0; i < ngroup; i++) {
                        if (bp >= ep)
                                goto jp_done;
-                       (void)printf(" (group%d: ", i);
+                       (void)printf("\n\t    group #%u: ", i+1);
                        if ((advance = pimv2_addr_print(bp, pimv2_group, 0)) < 0) {
                                (void)printf("...)");
                                goto jp_done;
@@ -742,36 +886,32 @@ pimv2_print(register const u_char *bp, register u_int len)
                        }
                        njoin = EXTRACT_16BITS(&bp[0]);
                        nprune = EXTRACT_16BITS(&bp[2]);
-                       (void)printf(" join=%u", njoin);
+                       (void)printf(", joined sources: %u, pruned sources: %u", njoin,nprune);
                        bp += 4; len -= 4;
                        for (j = 0; j < njoin; j++) {
-                               (void)printf(" ");
+                               (void)printf("\n\t      joined source #%u: ",j+1);
                                if ((advance = pimv2_addr_print(bp, pimv2_source, 0)) < 0) {
                                        (void)printf("...)");
                                        goto jp_done;
                                }
                                bp += advance; len -= advance;
                        }
-                       (void)printf(" prune=%u", nprune);
                        for (j = 0; j < nprune; j++) {
-                               (void)printf(" ");
+                               (void)printf("\n\t      pruned source #%u: ",j+1);
                                if ((advance = pimv2_addr_print(bp, pimv2_source, 0)) < 0) {
                                        (void)printf("...)");
                                        goto jp_done;
                                }
                                bp += advance; len -= advance;
                        }
-                       (void)printf(")");
                }
        jp_done:
                break;
            }
 
-        case 4:
-        {
+       case PIMV2_TYPE_BOOTSTRAP:
+       {
                int i, j, frpcnt;
-
-               (void)printf(" Bootstrap");
                bp += 4;
 
                /* Fragment Tag, Hash Mask len, and BSR-priority */
@@ -808,12 +948,12 @@ pimv2_print(register const u_char *bp, register u_int len)
                                (void)printf("...)");
                                goto bs_done;
                        }
-                       (void)printf(" RPcnt=%d", frpcnt = bp[0]);
+                       (void)printf(" RPcnt=%d", bp[0]);
                        if (bp + 1 >= ep) {
                                (void)printf("...)");
                                goto bs_done;
                        }
-                       (void)printf(" FRPcnt=%d", bp[1]);
+                       (void)printf(" FRPcnt=%d", frpcnt = bp[1]);
                        bp += 4;
 
                        for (j = 0; j < frpcnt && bp < ep; j++) {
@@ -844,9 +984,8 @@ pimv2_print(register const u_char *bp, register u_int len)
                }
           bs_done:
                break;
-        }
-        case 5:
-               (void)printf(" Assert");
+       }
+       case PIMV2_TYPE_ASSERT:
                bp += 4; len -= 4;
                if (bp >= ep)
                        break;
@@ -872,11 +1011,9 @@ pimv2_print(register const u_char *bp, register u_int len)
                (void)printf(" metric=%u", EXTRACT_32BITS(&bp[4]));
                break;
 
-        case 8:
-        {
+       case PIMV2_TYPE_CANDIDATE_RP:
+       {
                int i, pfxcnt;
-
-               (void)printf(" Candidate-RP-Advertisement");
                bp += 4;
 
                /* Prefix-Cnt, Priority, and Holdtime */
@@ -910,10 +1047,9 @@ pimv2_print(register const u_char *bp, register u_int len)
                        bp += advance;
                }
                break;
-        }
+       }
 
-        case 9:
-               (void)printf(" Prune-Refresh");
+       case PIMV2_TYPE_PRUNE_REFRESH:
                (void)printf(" src=");
                if ((advance = pimv2_addr_print(bp, pimv2_unicast, 0)) < 0) {
                        (void)printf("...");
@@ -939,7 +1075,7 @@ pimv2_print(register const u_char *bp, register u_int len)
 
 
         default:
-               (void)printf(" [type %d]", pim->pim_type);
+               (void)printf(" [type %d]", PIM_TYPE(pim->pim_typever));
                break;
        }
 
@@ -948,3 +1084,10 @@ pimv2_print(register const u_char *bp, register u_int len)
 trunc:
        (void)printf("[|pim]");
 }
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */