X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/c9d84d15c5c4dc8eca7594101fe5026080ed641e..381b94ccaff9dd04f21cdbb4bf8ddeb8b72d8688:/print-pim.c

diff --git a/print-pim.c b/print-pim.c
index 2eb795aa..87a611be 100644
--- a/print-pim.c
+++ b/print-pim.c
@@ -21,108 +21,330 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.9 1999-10-30 05:11:19 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.36 2002-12-11 07:14:06 guy Exp $ (LBL)";
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#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 <tcpdump-stdinc.h>
 
 /*
  * 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(BYTE_ORDER) && (BYTE_ORDER == LITTLE_ENDIAN)
-	u_char	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_char	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"
+
+#include "ip.h"
 
 static void pimv2_print(register const u_char *bp, register u_int len);
 
-void
-igmp_pim_print(register const u_char *bp, register u_int len)
+static void
+pimv1_join_prune_print(register const u_char *bp, register u_int len)
 {
-    register const u_char *ep;
-    register u_char type;
+	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;
+	}
 
-    ep = (const u_char *)snapend;
-    if (bp >= ep)
+	TCHECK2(bp[0], 4);
+	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);
+	maddrlen = bp[1];
+	addrlen = bp[2];
+	ngroups = bp[3];
+	bp += 4;
+	len -= 4;
+	while (ngroups--) {
+		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++) {
+			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;
+		}
+	}
 	return;
+trunc:
+	(void)printf("[|pim]");
+	return;
+}
 
-    type = bp[1];
-
-    switch (type) {
-    case 0:
-	(void)printf(" Query");
-	break;
-
-    case 1:
-	(void)printf(" Register");
-	break;
+void
+pimv1_print(register const u_char *bp, register u_int len)
+{
+	register const u_char *ep;
+	register u_char type;
 
-    case 2:
-	(void)printf(" Register-Stop");
-	break;
+	ep = (const u_char *)snapend;
+	if (bp >= ep)
+		return;
 
-    case 3:
-	(void)printf(" Join/Prune");
-	break;
+	type = bp[1];
 
-    case 4:
-	(void)printf(" RP-reachable");
-	break;
+	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");
+				break;
+			case 2:
+				(void)printf(" Sparse-Dense-mode");
+				break;
+			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 5:
-	(void)printf(" Assert");
-	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;
+	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], 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",
+		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 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;
 
-    case 6:
-	(void)printf(" Graft");
-	break;
+trunc:
+	(void)printf("[|pim]");
+	return;
+}
 
-    case 7:
-	(void)printf(" Graft-ACK");
-	break;
+/*
+ * auto-RP is a cisco protocol, documented at
+ * 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;
+	}
 
-    case 8:
-	(void)printf(" Mode");
-	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;
+
+		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] & 0xfe)
+				(void)printf("[rsvd=0x%02x]", bp[0] & 0xfe);
+			s = ',';
+			bp += 6; len -= 6;
+		}
+	}
+	return;
 
-    default:
-	(void)printf(" [type %d]", type);
-	break;
-    }
+trunc:
+	(void)printf("[|autorp]");
+	return;
 }
 
 void
@@ -138,121 +360,188 @@ 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");
+	switch (PIM_VER(pim->pim_typever)) {
+	case 2:		/* avoid hardcoding? */
+		(void)printf("pim v2");
 		pimv2_print(bp, len);
 		break;
-	 default:
-		(void)printf("v%d", pim->pim_ver);
+	default:
+		(void)printf("pim v%d", PIM_VER(pim->pim_typever));
 		break;
 	}
 	return;
 }
 
+/*
+ * PIMv2 uses encoded address representations.
+ *
+ * The last PIM-SM I-D before RFC2117 was published specified the
+ * following representation for unicast addresses.  However, RFC2117
+ * specified no encoding for unicast addresses with the unicast
+ * address length specified in the header.  Therefore, we have to
+ * guess which encoding is being used (Cisco's PIMv2 implementation
+ * uses the non-RFC encoding).  RFC2117 turns a previously "Reserved"
+ * field into a 'unicast-address-length-in-bytes' field.  We guess
+ * that it's the draft encoding if this reserved field is zero.
+ *
+ * RFC2362 goes back to the encoded format, and calls the addr length
+ * field "reserved" again.
+ *
+ * The first byte is the address family, from:
+ *
+ *    0    Reserved
+ *    1    IP (IP version 4)
+ *    2    IP6 (IP version 6)
+ *    3    NSAP
+ *    4    HDLC (8-bit multidrop)
+ *    5    BBN 1822
+ *    6    802 (includes all 802 media plus Ethernet "canonical format")
+ *    7    E.163
+ *    8    E.164 (SMDS, Frame Relay, ATM)
+ *    9    F.69 (Telex)
+ *   10    X.121 (X.25, Frame Relay)
+ *   11    IPX
+ *   12    Appletalk
+ *   13    Decnet IV
+ *   14    Banyan Vines
+ *   15    E.164 with NSAP format subaddress
+ *
+ * In addition, the second byte is an "Encoding".  0 is the default
+ * encoding for the address family, and no other encodings are currently
+ * specified.
+ *
+ */
+
+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
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Addr Family   | Encoding Type |     Unicast Address           |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+++++++
+ *  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
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Addr Family   | Encoding Type |   Reserved    |  Mask Len     |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |                Group multicast Address                        |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  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
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | Addr Family   | Encoding Type | Rsrvd   |S|W|R|  Mask Len     |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |                        Source Address                         |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
 static int
 pimv2_addr_print(const u_char *bp, enum pimv2_addrtype at, int silent)
 {
-	const u_char *ep;
 	int af;
-	char *afstr;
-	int len;
-
-	ep = (const u_char *)snapend;
-	if (bp >= ep)
-		return -1;
+	const char *afstr;
+	int len, hdrlen;
 
-	switch (bp[0]) {
-	 case 1:
-		af = AF_INET;
-		afstr = "IPv4";
-		break;
-#ifdef INET6
-	 case 2:
-		af = AF_INET6;
-		afstr = "IPv6";
-		break;
-#endif
-	 default:
-		return -1;
-	}
+	TCHECK(bp[0]);
 
-	if (bp[1] != 0)
-		return -1;
-
-	switch (at) {
-	 case pimv2_unicast:
-		if (af == AF_INET) {
+	if (pimv2_addr_len == 0) {
+		TCHECK(bp[1]);
+		switch (bp[0]) {
+		case 1:
+			af = AF_INET;
+			afstr = "IPv4";
 			len = 4;
-			if (bp + 2 + len > ep)
-				return -1;
-			if (!silent)
-				(void)printf("%s", ipaddr_string(bp + 2));
-		}
+			break;
 #ifdef INET6
-		else if (af == AF_INET6) {
+		case 2:
+			af = AF_INET6;
+			afstr = "IPv6";
 			len = 16;
-			if (bp + 2 + len > ep)
-				return -1;
-			if (!silent)
-				(void)printf("%s", ip6addr_string(bp + 2));
+			break;
+#endif
+		default:
+			return -1;
 		}
+		if (bp[1] != 0)
+			return -1;
+		hdrlen = 2;
+	} else {
+		switch (pimv2_addr_len) {
+		case 4:
+			af = AF_INET;
+			afstr = "IPv4";
+			break;
+#ifdef INET6
+		case 16:
+			af = AF_INET6;
+			afstr = "IPv6";
+			break;
 #endif
-		return 2 + len;
-	 case pimv2_group:
+		default:
+			return -1;
+			break;
+		}
+		len = pimv2_addr_len;
+		hdrlen = 0;
+	}
+
+	bp += hdrlen;
+	switch (at) {
+	case pimv2_unicast:
+		TCHECK2(bp[0], len);
 		if (af == AF_INET) {
-			len = 4;
-			if (bp + 4 + len > ep)
-				return -1;
 			if (!silent)
-				(void)printf("%s/%u", ipaddr_string(bp + 4), bp[3]);
+				(void)printf("%s", ipaddr_string(bp));
 		}
 #ifdef INET6
 		else if (af == AF_INET6) {
-			len = 16;
-			if (bp + 4 + len > ep)
-				return -1;
 			if (!silent)
-				(void)printf("%s/%u", ip6addr_string(bp + 4), bp[3]);
+				(void)printf("%s", ip6addr_string(bp));
 		}
 #endif
-		return 4 + len;
-	 case pimv2_source:
+		return hdrlen + len;
+	case pimv2_group:
+	case pimv2_source:
+		TCHECK2(bp[0], len + 2);
 		if (af == AF_INET) {
-			len = 4;
-			if (bp + 4 + len > ep)
-				return -1;
-			if (!silent)
-				(void)printf("%s/%u", ipaddr_string(bp + 4), bp[3]);
+			if (!silent) {
+				(void)printf("%s", ipaddr_string(bp + 2));
+				if (bp[1] != 32)
+					(void)printf("/%u", bp[1]);
+			}
 		}
 #ifdef INET6
 		else if (af == AF_INET6) {
-			len = 16;
-			if (bp + 4 + len > ep)
-				return -1;
-			if (!silent)
-				(void)printf("%s/%u", ip6addr_string(bp + 4), bp[3]);
+			if (!silent) {
+				(void)printf("%s", ip6addr_string(bp + 2));
+				if (bp[1] != 128)
+					(void)printf("/%u", bp[1]);
+			}
 		}
 #endif
-		if (vflag && bp[2] && !silent) {
-			(void)printf("(%s%s%s)",
-				bp[2] & 0x04 ? "S" : "",
-				bp[2] & 0x02 ? "W" : "",
-				bp[2] & 0x01 ? "R" : "");
+		if (bp[0] && !silent) {
+			if (at == pimv2_group) {
+				(void)printf("(0x%02x)", bp[0]);
+			} else {
+				(void)printf("(%s%s%s",
+					bp[0] & 0x04 ? "S" : "",
+					bp[0] & 0x02 ? "W" : "",
+					bp[0] & 0x01 ? "R" : "");
+				if (bp[0] & 0xf8) {
+					(void) printf("+0x%02x", bp[0] & 0xf8);
+				}
+				(void)printf(")");
+			}
 		}
-		return 4 + len;
+		return hdrlen + 2 + len;
 	default:
 		return -1;
 	}
+trunc:
+	return -1;
 }
 
 static void
@@ -265,36 +554,101 @@ pimv2_print(register const u_char *bp, register u_int len)
 	ep = (const u_char *)snapend;
 	if (bp >= ep)
 		return;
-#ifdef notyet			/* currently we see only version and type */
+	if (ep > bp + len)
+		ep = bp + len;
 	TCHECK(pim->pim_rsv);
-#endif
+	pimv2_addr_len = pim->pim_rsv;
+	if (pimv2_addr_len != 0)
+		(void)printf("[RFC2117-encoding] ");
 
-	switch (pim->pim_type) {
-	 case 0:
+	switch (PIM_TYPE(pim->pim_typever)) {
+	case 0:
 	    {
 		u_int16_t otype, olen;
 		(void)printf(" Hello");
 		bp += 4;
 		while (bp < ep) {
-			otype = ntohs(*(u_int16_t *)(bp + 0));
-			olen = ntohs(*(u_int16_t *)(bp + 2));
-			if (otype == 1 && olen == 2 && bp + 4 + olen <= ep) {
-				u_int16_t value;
-				(void)printf(" holdtime=");
-				value = ntohs(*(u_int16_t *)(bp + 4));
-				if (value == 0xffff)
-					(void)printf("infty");
+			TCHECK2(bp[0], 4);
+			otype = EXTRACT_16BITS(&bp[0]);
+			olen = EXTRACT_16BITS(&bp[2]);
+			TCHECK2(bp[0], 4 + olen);
+			switch (otype) {
+			case 1:		/* Hold time */
+				(void)printf(" (Hold-time ");
+				relts_print(EXTRACT_16BITS(&bp[4]));
+				(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
-					(void)printf("%u", value);
-				bp += 4 + olen;
-			} else
+					goto unknown;
+				break;
+
+
+			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);
+				} else {
+					(void)printf("%d)", EXTRACT_32BITS(&bp[4]));
+				}
+				break;
+
+			case 20:
+				(void)printf(" (Genid: 0x%08x)", EXTRACT_32BITS(&bp[4]));
 				break;
+
+			case 21:
+				(void)printf(" (State Refresh Capable; v%d", bp[4]);
+				if (bp[5] != 0) {
+					(void)printf(" interval ");
+					relts_print(bp[5]);
+				}
+				if (EXTRACT_16BITS(&bp[6]) != 0) {
+					(void)printf(" ?0x%04x?", EXTRACT_16BITS(&bp[6]));
+				}
+				(void)printf(")");
+				break;
+
+			case 22:	/* Bidir-Capable */
+				(void)printf(" (bidir-capable)");
+				break;
+
+			default:
+			unknown:
+				if (vflag)
+					(void)printf(" [Hello option %d]", otype);
+			}
+			bp += 4 + olen;
 		}
 		break;
 	    }
 
-	 case 1:
-	 {
+	case 1:
+	{
 		struct ip *ip;
 
 		(void)printf(" Register");
@@ -308,25 +662,25 @@ pimv2_print(register const u_char *bp, register u_int len)
 		if (bp >= ep)
 			break;
 		ip = (struct ip *)bp;
-		switch(ip->ip_v) {
-		 case 4:	/* IPv4 */
+		switch (IP_V(ip)) {
+		case 4:	/* IPv4 */
 			printf(" ");
 			ip_print(bp, len);
 			break;
 #ifdef INET6
-		 case 6:	/* IPv6 */
+		case 6:	/* IPv6 */
 			printf(" ");
 			ip6_print(bp, len);
 			break;
 #endif
-		 default:
-			(void)printf(" IP ver %d", ip->ip_v);
+		default:
+			(void)printf(" IP ver %d", IP_V(ip));
 			break;
 		}
 		break;
-	 }
+	}
 
-	 case 2:
+	case 2:
 		(void)printf(" Register-Stop");
 		bp += 4; len -= 4;
 		if (bp >= ep)
@@ -347,9 +701,9 @@ pimv2_print(register const u_char *bp, register u_int len)
 		bp += advance; len -= advance;
 		break;
 
-	 case 3:
-	 case 6:
-	 case 7:
+	case 3:
+	case 6:
+	case 7:
 	    {
 		u_int8_t ngroup;
 		u_int16_t holdtime;
@@ -357,19 +711,19 @@ pimv2_print(register const u_char *bp, register u_int len)
 		u_int16_t nprune;
 		int i, j;
 
-		switch (pim->pim_type) {
-		 case 3:
+		switch (PIM_TYPE(pim->pim_typever)) {
+		case 3:
 			(void)printf(" Join/Prune");
 			break;
-		 case 6:
+		case 6:
 			(void)printf(" Graft");
 			break;
-		 case 7:
+		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=");
@@ -382,14 +736,14 @@ pimv2_print(register const u_char *bp, register u_int len)
 		if (bp + 4 > ep)
 			break;
 		ngroup = bp[1];
-		holdtime = ntohs(*(u_int16_t *)(bp + 2));
+		holdtime = EXTRACT_16BITS(&bp[2]);
 		(void)printf(" groups=%u", ngroup);
-		if (pim->pim_type != 7) {	/*not for Graft-ACK*/
+		if (PIM_TYPE(pim->pim_typever) != 7) {	/*not for Graft-ACK*/
 			(void)printf(" holdtime=");
 			if (holdtime == 0xffff)
 				(void)printf("infty");
 			else
-				(void)printf("%u", holdtime);
+				relts_print(holdtime);
 		}
 		bp += 4; len -= 4;
 		for (i = 0; i < ngroup; i++) {
@@ -405,8 +759,8 @@ pimv2_print(register const u_char *bp, register u_int len)
 				(void)printf("...)");
 				goto jp_done;
 			}
-			njoin = ntohs(*(u_int16_t *)(bp + 0));
-			nprune = ntohs(*(u_int16_t *)(bp + 2));
+			njoin = EXTRACT_16BITS(&bp[0]);
+			nprune = EXTRACT_16BITS(&bp[2]);
 			(void)printf(" join=%u", njoin);
 			bp += 4; len -= 4;
 			for (j = 0; j < njoin; j++) {
@@ -432,8 +786,8 @@ pimv2_print(register const u_char *bp, register u_int len)
 		break;
 	    }
 
-	 case 4:
-	 {
+	case 4:
+	{
 		int i, j, frpcnt;
 
 		(void)printf(" Bootstrap");
@@ -441,7 +795,7 @@ pimv2_print(register const u_char *bp, register u_int len)
 
 		/* Fragment Tag, Hash Mask len, and BSR-priority */
 		if (bp + sizeof(u_int16_t) >= ep) break;
-		(void)printf(" tag=%x", ntohs(*(u_int16_t *)bp));
+		(void)printf(" tag=%x", EXTRACT_16BITS(bp));
 		bp += sizeof(u_int16_t);
 		if (bp >= ep) break;
 		(void)printf(" hashmlen=%d", bp[0]);
@@ -473,12 +827,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++) {
@@ -492,25 +846,25 @@ pimv2_print(register const u_char *bp, register u_int len)
 				}
 				bp += advance;
 
-				if (bp + 2 >= ep) {
+				if (bp + 1 >= ep) {
 					(void)printf("...)");
 					goto bs_done;
 				}
-				(void)printf(",holdtime=%d",
-					     ntohs(*(u_int16_t *)bp));
-				if (bp + 3 >= ep) {
+				(void)printf(",holdtime=");
+				relts_print(EXTRACT_16BITS(bp));
+				if (bp + 2 >= ep) {
 					(void)printf("...)");
 					goto bs_done;
 				}
-				(void)printf(",prio=%d", bp[3]);
+				(void)printf(",prio=%d", bp[2]);
 				bp += 4;
 			}
 			(void)printf(")");
 		}
 	   bs_done:
 		break;
-	 }
-	 case 5:
+	}
+	case 5:
 		(void)printf(" Assert");
 		bp += 4; len -= 4;
 		if (bp >= ep)
@@ -531,14 +885,14 @@ pimv2_print(register const u_char *bp, register u_int len)
 		bp += advance; len -= advance;
 		if (bp + 8 > ep)
 			break;
-		if (ntohl(*(u_int32_t *)bp) & 0x80000000)
+		if (bp[0] & 0x80)
 			(void)printf(" RPT");
-		(void)printf(" pref=%u", ntohl(*(u_int32_t *)bp & 0x7fffffff));
-		(void)printf(" metric=%u", ntohl(*(u_int32_t *)(bp + 4)));
+		(void)printf(" pref=%u", EXTRACT_32BITS(&bp[0]) & 0x7fffffff);
+		(void)printf(" metric=%u", EXTRACT_32BITS(&bp[4]));
 		break;
 
-	 case 8:
-	 {
+	case 8:
+	{
 		int i, pfxcnt;
 
 		(void)printf(" Candidate-RP-Advertisement");
@@ -551,7 +905,8 @@ pimv2_print(register const u_char *bp, register u_int len)
 		if (bp + 1 >= ep) break;
 		(void)printf(" prio=%d", bp[1]);
 		if (bp + 3 >= ep) break;
-		(void)printf(" holdtime=%d", ntohs(*(u_int16_t *)(bp + 2)));
+		(void)printf(" holdtime=");
+		relts_print(EXTRACT_16BITS(&bp[2]));
 		bp += 4;
 
 		/* Encoded-Unicast-RP-Address */
@@ -574,12 +929,41 @@ pimv2_print(register const u_char *bp, register u_int len)
 			bp += advance;
 		}
 		break;
-	 }
+	}
+
+	case 9:
+		(void)printf(" Prune-Refresh");
+		(void)printf(" src=");
+		if ((advance = pimv2_addr_print(bp, pimv2_unicast, 0)) < 0) {
+			(void)printf("...");
+			break;
+		}
+		bp += advance;
+		(void)printf(" grp=");
+		if ((advance = pimv2_addr_print(bp, pimv2_group, 0)) < 0) {
+			(void)printf("...");
+			break;
+		}
+		bp += advance;
+		(void)printf(" forwarder=");
+		if ((advance = pimv2_addr_print(bp, pimv2_unicast, 0)) < 0) {
+			(void)printf("...");
+			break;
+		}
+		bp += advance;
+		TCHECK2(bp[0], 2);
+		(void)printf(" TUNR ");
+		relts_print(EXTRACT_16BITS(bp));
+		break;
+
 
 	 default:
-		(void)printf(" [type %d]", pim->pim_type);
+		(void)printf(" [type %d]", PIM_TYPE(pim->pim_typever));
 		break;
 	}
 
 	return;
+
+trunc:
+	(void)printf("[|pim]");
 }