X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/c6d3ff424a838df85b2396e479dcf47ea5bfb043..refs/pull/433/head:/print-aodv.c

diff --git a/print-aodv.c b/print-aodv.c
index 92d21859..ef27eee6 100644
--- a/print-aodv.c
+++ b/print-aodv.c
@@ -30,251 +30,556 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-aodv.c,v 1.4 2003-09-06 22:16:56 guy Exp $ (LBL)";
-#endif
-
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include <stddef.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 
-#include "aodv.h"
+
+struct aodv_rreq {
+	uint8_t		rreq_type;	/* AODV message type (1) */
+	uint8_t		rreq_flags;	/* various flags */
+	uint8_t		rreq_zero0;	/* reserved, set to zero */
+	uint8_t		rreq_hops;	/* number of hops from originator */
+	uint32_t	rreq_id;	/* request ID */
+	uint32_t	rreq_da;	/* destination IPv4 address */
+	uint32_t	rreq_ds;	/* destination sequence number */
+	uint32_t	rreq_oa;	/* originator IPv4 address */
+	uint32_t	rreq_os;	/* originator sequence number */
+};
+#ifdef INET6
+struct aodv_rreq6 {
+	uint8_t		rreq_type;	/* AODV message type (1) */
+	uint8_t		rreq_flags;	/* various flags */
+	uint8_t		rreq_zero0;	/* reserved, set to zero */
+	uint8_t		rreq_hops;	/* number of hops from originator */
+	uint32_t	rreq_id;	/* request ID */
+	struct in6_addr	rreq_da;	/* destination IPv6 address */
+	uint32_t	rreq_ds;	/* destination sequence number */
+	struct in6_addr	rreq_oa;	/* originator IPv6 address */
+	uint32_t	rreq_os;	/* originator sequence number */
+};
+struct aodv_rreq6_draft_01 {
+	uint8_t		rreq_type;	/* AODV message type (16) */
+	uint8_t		rreq_flags;	/* various flags */
+	uint8_t		rreq_zero0;	/* reserved, set to zero */
+	uint8_t		rreq_hops;	/* number of hops from originator */
+	uint32_t	rreq_id;	/* request ID */
+	uint32_t	rreq_ds;	/* destination sequence number */
+	uint32_t	rreq_os;	/* originator sequence number */
+	struct in6_addr	rreq_da;	/* destination IPv6 address */
+	struct in6_addr	rreq_oa;	/* originator IPv6 address */
+};
+#endif
+
+#define	RREQ_JOIN	0x80		/* join (reserved for multicast */
+#define	RREQ_REPAIR	0x40		/* repair (reserved for multicast */
+#define	RREQ_GRAT	0x20		/* gratuitous RREP */
+#define	RREQ_DEST	0x10		/* destination only */
+#define	RREQ_UNKNOWN	0x08		/* unknown destination sequence num */
+#define	RREQ_FLAGS_MASK	0xF8		/* mask for rreq_flags */
+
+struct aodv_rrep {
+	uint8_t		rrep_type;	/* AODV message type (2) */
+	uint8_t		rrep_flags;	/* various flags */
+	uint8_t		rrep_ps;	/* prefix size */
+	uint8_t		rrep_hops;	/* number of hops from o to d */
+	uint32_t	rrep_da;	/* destination IPv4 address */
+	uint32_t	rrep_ds;	/* destination sequence number */
+	uint32_t	rrep_oa;	/* originator IPv4 address */
+	uint32_t	rrep_life;	/* lifetime of this route */
+};
+#ifdef INET6
+struct aodv_rrep6 {
+	uint8_t		rrep_type;	/* AODV message type (2) */
+	uint8_t		rrep_flags;	/* various flags */
+	uint8_t		rrep_ps;	/* prefix size */
+	uint8_t		rrep_hops;	/* number of hops from o to d */
+	struct in6_addr	rrep_da;	/* destination IPv6 address */
+	uint32_t	rrep_ds;	/* destination sequence number */
+	struct in6_addr	rrep_oa;	/* originator IPv6 address */
+	uint32_t	rrep_life;	/* lifetime of this route */
+};
+struct aodv_rrep6_draft_01 {
+	uint8_t		rrep_type;	/* AODV message type (17) */
+	uint8_t		rrep_flags;	/* various flags */
+	uint8_t		rrep_ps;	/* prefix size */
+	uint8_t		rrep_hops;	/* number of hops from o to d */
+	uint32_t	rrep_ds;	/* destination sequence number */
+	struct in6_addr	rrep_da;	/* destination IPv6 address */
+	struct in6_addr	rrep_oa;	/* originator IPv6 address */
+	uint32_t	rrep_life;	/* lifetime of this route */
+};
+#endif
+
+#define	RREP_REPAIR		0x80	/* repair (reserved for multicast */
+#define	RREP_ACK		0x40	/* acknowledgement required */
+#define	RREP_FLAGS_MASK		0xC0	/* mask for rrep_flags */
+#define	RREP_PREFIX_MASK	0x1F	/* mask for prefix size */
+
+struct rerr_unreach {
+	uint32_t	u_da;	/* IPv4 address */
+	uint32_t	u_ds;	/* sequence number */
+};
+#ifdef INET6
+struct rerr_unreach6 {
+	struct in6_addr	u_da;	/* IPv6 address */
+	uint32_t	u_ds;	/* sequence number */
+};
+struct rerr_unreach6_draft_01 {
+	struct in6_addr	u_da;	/* IPv6 address */
+	uint32_t	u_ds;	/* sequence number */
+};
+#endif
+
+struct aodv_rerr {
+	uint8_t		rerr_type;	/* AODV message type (3 or 18) */
+	uint8_t		rerr_flags;	/* various flags */
+	uint8_t		rerr_zero0;	/* reserved, set to zero */
+	uint8_t		rerr_dc;	/* destination count */
+};
+
+#define RERR_NODELETE		0x80	/* don't delete the link */
+#define RERR_FLAGS_MASK		0x80	/* mask for rerr_flags */
+
+struct aodv_rrep_ack {
+	uint8_t		ra_type;
+	uint8_t		ra_zero0;
+};
+
+#define	AODV_RREQ		1	/* route request */
+#define	AODV_RREP		2	/* route response */
+#define	AODV_RERR		3	/* error report */
+#define	AODV_RREP_ACK		4	/* route response acknowledgement */
+
+#define AODV_V6_DRAFT_01_RREQ		16	/* IPv6 route request */
+#define AODV_V6_DRAFT_01_RREP		17	/* IPv6 route response */
+#define AODV_V6_DRAFT_01_RERR		18	/* IPv6 error report */
+#define AODV_V6_DRAFT_01_RREP_ACK	19	/* IPV6 route response acknowledgment */
+
+struct aodv_ext {
+	uint8_t		type;		/* extension type */
+	uint8_t		length;		/* extension length */
+};
+
+struct aodv_hello {
+	struct	aodv_ext	eh;		/* extension header */
+	uint8_t			interval[4];	/* expect my next hello in
+						 * (n) ms
+						 * NOTE: this is not aligned */
+};
+
+#define	AODV_EXT_HELLO	1
 
 static void
-aodv_extension(struct aodv_ext *ep, u_int length)
+aodv_extension(netdissect_options *ndo,
+               const struct aodv_ext *ep, u_int length)
 {
-	u_int i;
-	struct aodv_hello *ah;
+	const struct aodv_hello *ah;
 
 	switch (ep->type) {
 	case AODV_EXT_HELLO:
-		if (snapend < (u_char *) ep) {
-			printf(" [|hello]");
-			return;
-		}
-		i = min(length, (u_int)(snapend - (u_char *) ep));
-		if (i < sizeof(struct aodv_hello)) {
-			printf(" [|hello]");
-			return;
-		}
-		i -= sizeof(struct aodv_hello);
-		ah = (void *) ep;
-		printf("\n\text HELLO %d ms",
-			EXTRACT_32BITS(ah->interval));
+		ah = (const struct aodv_hello *)(const void *)ep;
+		ND_TCHECK(*ah);
+		if (length < sizeof(struct aodv_hello))
+			goto trunc;
+		ND_PRINT((ndo, "\n\text HELLO %ld ms",
+		    (unsigned long)EXTRACT_32BITS(&ah->interval)));
 		break;
 
 	default:
-		printf("\n\text %d %d", ep->type, ep->length);
+		ND_PRINT((ndo, "\n\text %u %u", ep->type, ep->length));
 		break;
 	}
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|hello]"));
 }
 
 static void
-aodv_rreq(union aodv *ap, const u_char *dat, u_int length, void *ip6
-#ifndef INET6
-	_U_
-#endif
-	)
+aodv_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 {
 	u_int i;
+	const struct aodv_rreq *ap = (const struct aodv_rreq *)dat;
 
-	if (snapend < dat) {
-		printf(" [|aodv]");
-		return;
-	}
-	i = min(length, (u_int)(snapend - dat));
-	if (i < sizeof(ap->rreq)) {
-		printf(" [|rreq]");
-		return;
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
+	ND_PRINT((ndo, " rreq %u %s%s%s%s%shops %u id 0x%08lx\n"
+	    "\tdst %s seq %lu src %s seq %lu", length,
+	    ap->rreq_type & RREQ_JOIN ? "[J]" : "",
+	    ap->rreq_type & RREQ_REPAIR ? "[R]" : "",
+	    ap->rreq_type & RREQ_GRAT ? "[G]" : "",
+	    ap->rreq_type & RREQ_DEST ? "[D]" : "",
+	    ap->rreq_type & RREQ_UNKNOWN ? "[U] " : " ",
+	    ap->rreq_hops,
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_id),
+	    ipaddr_string(ndo, &ap->rreq_da),
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_ds),
+	    ipaddr_string(ndo, &ap->rreq_oa),
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_os)));
+	i = length - sizeof(*ap);
+	if (i >= sizeof(struct aodv_ext))
+		aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|rreq"));
+}
+
+static void
+aodv_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
+{
+	u_int i;
+	const struct aodv_rrep *ap = (const struct aodv_rrep *)dat;
+
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
+	ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n"
+	    "\tdst %s dseq %lu src %s %lu ms", length,
+	    ap->rrep_type & RREP_REPAIR ? "[R]" : "",
+	    ap->rrep_type & RREP_ACK ? "[A] " : " ",
+	    ap->rrep_ps & RREP_PREFIX_MASK,
+	    ap->rrep_hops,
+	    ipaddr_string(ndo, &ap->rrep_da),
+	    (unsigned long)EXTRACT_32BITS(&ap->rrep_ds),
+	    ipaddr_string(ndo, &ap->rrep_oa),
+	    (unsigned long)EXTRACT_32BITS(&ap->rrep_life)));
+	i = length - sizeof(*ap);
+	if (i >= sizeof(struct aodv_ext))
+		aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|rreq"));
+}
+
+static void
+aodv_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
+{
+	u_int i, dc;
+	const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
+	const struct rerr_unreach *dp;
+
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
+	ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
+	    ap->rerr_flags & RERR_NODELETE ? "[D]" : "",
+	    ap->rerr_dc, length));
+	dp = (struct rerr_unreach *)(dat + sizeof(*ap));
+	i = length - sizeof(*ap);
+	for (dc = ap->rerr_dc; dc != 0; dc--) {
+		ND_TCHECK(*dp);
+		if (i < sizeof(*dp))
+			goto trunc;
+		ND_PRINT((ndo, " {%s}(%ld)", ipaddr_string(ndo, &dp->u_da),
+		    (unsigned long)EXTRACT_32BITS(&dp->u_ds)));
+		dp++;
+		i -= sizeof(*dp);
 	}
-	i -= sizeof(ap->rreq);
+	return;
+
+trunc:
+	ND_PRINT((ndo, "[|rerr]"));
+}
+
+static void
 #ifdef INET6
-	if (ip6 != NULL) {
-		printf(" rreq %d %s%s%s%s%shops %d id 0x%08lx\n"
-			"\tdst %s seq %ld src %s seq %ld", length,
-			ap->rreq6.rreq_type & RREQ_JOIN ? "[J]" : "",
-			ap->rreq6.rreq_type & RREQ_REPAIR ? "[R]" : "",
-			ap->rreq6.rreq_type & RREQ_GRAT ? "[G]" : "",
-			ap->rreq6.rreq_type & RREQ_DEST ? "[D]" : "",
-			ap->rreq6.rreq_type & RREQ_UNKNOWN ? "[U] " : " ",
-			ap->rreq6.rreq_hops,
-			(unsigned long)EXTRACT_32BITS(ap->rreq6.rreq_id),
-			ip6addr_string(&ap->rreq6.rreq_da),
-			(unsigned long)EXTRACT_32BITS(ap->rreq6.rreq_ds),
-			ip6addr_string(&ap->rreq6.rreq_oa),
-			(unsigned long)EXTRACT_32BITS(ap->rreq6.rreq_os));
-		if (i >= sizeof(ap->rreq6) + sizeof(struct aodv_ext)) {
-			aodv_extension((void *) (&ap->rreq6 + 1),
-					length - sizeof(ap->rreq6));
-		}
-		} else
+aodv_v6_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
+#else
+aodv_v6_rreq(netdissect_options *ndo, const u_char *dat _U_, u_int length)
+#endif
+{
+#ifdef INET6
+	u_int i;
+	const struct aodv_rreq6 *ap = (const struct aodv_rreq6 *)dat;
+
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
+	ND_PRINT((ndo, " v6 rreq %u %s%s%s%s%shops %u id 0x%08lx\n"
+	    "\tdst %s seq %lu src %s seq %lu", length,
+	    ap->rreq_type & RREQ_JOIN ? "[J]" : "",
+	    ap->rreq_type & RREQ_REPAIR ? "[R]" : "",
+	    ap->rreq_type & RREQ_GRAT ? "[G]" : "",
+	    ap->rreq_type & RREQ_DEST ? "[D]" : "",
+	    ap->rreq_type & RREQ_UNKNOWN ? "[U] " : " ",
+	    ap->rreq_hops,
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_id),
+	    ip6addr_string(ndo, &ap->rreq_da),
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_ds),
+	    ip6addr_string(ndo, &ap->rreq_oa),
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_os)));
+	i = length - sizeof(*ap);
+	if (i >= sizeof(struct aodv_ext))
+		aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|rreq"));
+#else
+	ND_PRINT((ndo, " v6 rreq %u", length));
 #endif
-	{
-		printf(" rreq %d %s%s%s%s%shops %d id 0x%08x\n"
-			"\tdst %s seq %d src %s seq %d", length,
-			ap->rreq.rreq_type & RREQ_JOIN ? "[J]" : "",
-			ap->rreq.rreq_type & RREQ_REPAIR ? "[R]" : "",
-			ap->rreq.rreq_type & RREQ_GRAT ? "[G]" : "",
-			ap->rreq.rreq_type & RREQ_DEST ? "[D]" : "",
-			ap->rreq.rreq_type & RREQ_UNKNOWN ? "[U] " : " ",
-			ap->rreq.rreq_hops,
-			EXTRACT_32BITS(ap->rreq.rreq_id),
-			ipaddr_string(ap->rreq.rreq_da),
-			EXTRACT_32BITS(ap->rreq.rreq_ds),
-			ipaddr_string(ap->rreq.rreq_oa),
-			EXTRACT_32BITS(ap->rreq.rreq_os));
-		if (i >= sizeof(ap->rreq) + sizeof(struct aodv_ext)) {
-			aodv_extension((void *) (&ap->rreq + 1),
-					length - sizeof(ap->rreq));
-		}
-	}
 }
 
 static void
-aodv_rrep(union aodv *ap, const u_char *dat, u_int length, void *ip6
-#ifndef INET6
-	_U_
+#ifdef INET6
+aodv_v6_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
+#else
+aodv_v6_rrep(netdissect_options *ndo, const u_char *dat _U_, u_int length)
 #endif
-	)
 {
+#ifdef INET6
 	u_int i;
+	const struct aodv_rrep6 *ap = (const struct aodv_rrep6 *)dat;
 
-	if (snapend < dat) {
-		printf(" [|aodv]");
-		return;
-	}
-	i = min(length, (u_int)(snapend - dat));
-	if (i < sizeof(ap->rrep)) {
-		printf(" [|rrep]");
-		return;
-	}
-	i -= sizeof(ap->rrep);
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
+	ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n"
+	   "\tdst %s dseq %lu src %s %lu ms", length,
+	    ap->rrep_type & RREP_REPAIR ? "[R]" : "",
+	    ap->rrep_type & RREP_ACK ? "[A] " : " ",
+	    ap->rrep_ps & RREP_PREFIX_MASK,
+	    ap->rrep_hops,
+	    ip6addr_string(ndo, &ap->rrep_da),
+	    (unsigned long)EXTRACT_32BITS(&ap->rrep_ds),
+	    ip6addr_string(ndo, &ap->rrep_oa),
+	    (unsigned long)EXTRACT_32BITS(&ap->rrep_life)));
+	i = length - sizeof(*ap);
+	if (i >= sizeof(struct aodv_ext))
+		aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|rreq"));
+#else
+	ND_PRINT((ndo, " rrep %u", length));
+#endif
+}
+
+static void
 #ifdef INET6
-	if (ip6 != NULL) {
-		printf(" rrep %d %s%sprefix %d hops %d\n"
-		       "\tdst %s dseq %d src %s %d ms", length,
-			ap->rrep6.rrep_type & RREP_REPAIR ? "[R]" : "",
-			ap->rrep6.rrep_type & RREP_ACK ? "[A] " : " ",
-			ap->rrep6.rrep_ps & RREP_PREFIX_MASK,
-			ap->rrep6.rrep_hops,
-			ip6addr_string(&ap->rrep6.rrep_da),
-			EXTRACT_32BITS(ap->rrep6.rrep_ds),
-			ip6addr_string(&ap->rrep6.rrep_oa),
-			EXTRACT_32BITS(ap->rrep6.rrep_life));
-		if (i >= sizeof(ap->rrep6) + sizeof(struct aodv_ext)) {
-			aodv_extension((void *) (&ap->rrep6 + 1),
-					length - sizeof(ap->rrep6));
-		}
-	} else
+aodv_v6_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
+#else
+aodv_v6_rerr(netdissect_options *ndo, const u_char *dat _U_, u_int length)
 #endif
-	{
-		printf(" rrep %d %s%sprefix %d hops %d\n"
-		       "\tdst %s dseq %d src %s %d ms", length,
-			ap->rrep.rrep_type & RREP_REPAIR ? "[R]" : "",
-			ap->rrep.rrep_type & RREP_ACK ? "[A] " : " ",
-			ap->rrep.rrep_ps & RREP_PREFIX_MASK,
-			ap->rrep.rrep_hops,
-			ipaddr_string(ap->rrep.rrep_da),
-			EXTRACT_32BITS(ap->rrep.rrep_ds),
-			ipaddr_string(ap->rrep.rrep_oa),
-			EXTRACT_32BITS(ap->rrep.rrep_life));
-		if (i >= sizeof(ap->rrep) + sizeof(struct aodv_ext)) {
-			aodv_extension((void *) (&ap->rrep + 1),
-					length - sizeof(ap->rrep));
-		}
+{
+#ifdef INET6
+	u_int i, dc;
+	const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
+	const struct rerr_unreach6 *dp6;
+
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
+	ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
+	    ap->rerr_flags & RERR_NODELETE ? "[D]" : "",
+	    ap->rerr_dc, length));
+	dp6 = (struct rerr_unreach6 *)(void *)(ap + 1);
+	i = length - sizeof(*ap);
+	for (dc = ap->rerr_dc; dc != 0; dc--) {
+		ND_TCHECK(*dp6);
+		if (i < sizeof(*dp6))
+			goto trunc;
+		ND_PRINT((ndo, " {%s}(%ld)", ip6addr_string(ndo, &dp6->u_da),
+		    (unsigned long)EXTRACT_32BITS(&dp6->u_ds)));
+		dp6++;
+		i -= sizeof(*dp6);
 	}
+	return;
+
+trunc:
+	ND_PRINT((ndo, "[|rerr]"));
+#else
+	ND_PRINT((ndo, " rerr %u", length));
+#endif
 }
 
 static void
-aodv_rerr(union aodv *ap, u_int length, void *ip6
-#ifndef INET6
-	_U_
+#ifdef INET6
+aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
+#else
+aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat _U_, u_int length)
 #endif
-	)
 {
-	int i, j, n, trunc;
-	struct rerr_unreach *dp = NULL;
 #ifdef INET6
-	struct rerr_unreach6 *dp6 = NULL;
+	u_int i;
+	const struct aodv_rreq6_draft_01 *ap = (const struct aodv_rreq6_draft_01 *)dat;
+
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
+	ND_PRINT((ndo, " rreq %u %s%s%s%s%shops %u id 0x%08lx\n"
+	    "\tdst %s seq %lu src %s seq %lu", length,
+	    ap->rreq_type & RREQ_JOIN ? "[J]" : "",
+	    ap->rreq_type & RREQ_REPAIR ? "[R]" : "",
+	    ap->rreq_type & RREQ_GRAT ? "[G]" : "",
+	    ap->rreq_type & RREQ_DEST ? "[D]" : "",
+	    ap->rreq_type & RREQ_UNKNOWN ? "[U] " : " ",
+	    ap->rreq_hops,
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_id),
+	    ip6addr_string(ndo, &ap->rreq_da),
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_ds),
+	    ip6addr_string(ndo, &ap->rreq_oa),
+	    (unsigned long)EXTRACT_32BITS(&ap->rreq_os)));
+	i = length - sizeof(*ap);
+	if (i >= sizeof(struct aodv_ext))
+		aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|rreq"));
+#else
+	ND_PRINT((ndo, " rreq %u", length));
 #endif
+}
 
-	i = length - offsetof(struct aodv_rerr, r);
+static void
 #ifdef INET6
-	if (ip6 != NULL) {
-		j = sizeof(ap->rerr.r.dest6[0]);
-		dp6 = &ap->rerr.r.dest6[0];
-	} else
+aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
+#else
+aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat _U_, u_int length)
 #endif
-	{
-		j = sizeof(ap->rerr.r.dest[0]);
-		dp = &ap->rerr.r.dest[0];
-	}
-	n = ap->rerr.rerr_dc * j;
-	printf(" rerr %s [items %d] [%d]:",
-		ap->rerr.rerr_flags & RERR_NODELETE ? "[D]" : "",
-		ap->rerr.rerr_dc, length);
-	trunc = n - (i/j);
+{
+#ifdef INET6
+	u_int i;
+	const struct aodv_rrep6_draft_01 *ap = (const struct aodv_rrep6_draft_01 *)dat;
+
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
+	ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n"
+	   "\tdst %s dseq %lu src %s %lu ms", length,
+	    ap->rrep_type & RREP_REPAIR ? "[R]" : "",
+	    ap->rrep_type & RREP_ACK ? "[A] " : " ",
+	    ap->rrep_ps & RREP_PREFIX_MASK,
+	    ap->rrep_hops,
+	    ip6addr_string(ndo, &ap->rrep_da),
+	    (unsigned long)EXTRACT_32BITS(&ap->rrep_ds),
+	    ip6addr_string(ndo, &ap->rrep_oa),
+	    (unsigned long)EXTRACT_32BITS(&ap->rrep_life)));
+	i = length - sizeof(*ap);
+	if (i >= sizeof(struct aodv_ext))
+		aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|rreq"));
+#else
+	ND_PRINT((ndo, " rrep %u", length));
+#endif
+}
+
+static void
 #ifdef INET6
-	if (ip6 != NULL) {
-		for (; i -= j >= 0; ++dp6) {
-			printf(" {%s}(%d)", ip6addr_string(&dp6->u_da),
-				EXTRACT_32BITS(dp6->u_ds));
-		}
-	} else
+aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
+#else
+aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat _U_, u_int length)
 #endif
-	{
-		for (; i -= j >= 0; ++dp) {
-			printf(" {%s}(%d)", ipaddr_string(dp->u_da),
-				EXTRACT_32BITS(dp->u_ds));
-		}
+{
+#ifdef INET6
+	u_int i, dc;
+	const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
+	const struct rerr_unreach6_draft_01 *dp6;
+
+	ND_TCHECK(*ap);
+	if (length < sizeof(*ap))
+		goto trunc;
+	ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
+	    ap->rerr_flags & RERR_NODELETE ? "[D]" : "",
+	    ap->rerr_dc, length));
+	dp6 = (struct rerr_unreach6_draft_01 *)(void *)(ap + 1);
+	i = length - sizeof(*ap);
+	for (dc = ap->rerr_dc; dc != 0; dc--) {
+		ND_TCHECK(*dp6);
+		if (i < sizeof(*dp6))
+			goto trunc;
+		ND_PRINT((ndo, " {%s}(%ld)", ip6addr_string(ndo, &dp6->u_da),
+		    (unsigned long)EXTRACT_32BITS(&dp6->u_ds)));
+		dp6++;
+		i -= sizeof(*dp6);
 	}
-	if (trunc)
-		printf("[|rerr]");
+	return;
+
+trunc:
+	ND_PRINT((ndo, "[|rerr]"));
+#else
+	ND_PRINT((ndo, " rerr %u", length));
+#endif
 }
 
 void
-aodv_print(const u_char *dat, u_int length, void *ip6)
+aodv_print(netdissect_options *ndo,
+           const u_char *dat, u_int length, int is_ip6)
 {
-	union aodv *ap;
+	uint8_t msg_type;
 
-	ap = (union aodv *)dat;
-	if (snapend < dat) {
-		printf(" [|aodv]");
-		return;
-	}
-	if (min(length, (u_int)(snapend - dat)) < sizeof(ap->rrep_ack)) {
-		printf(" [|aodv]");
-		return;
-	}
-	printf(" aodv");
+	/*
+	 * The message type is the first byte; make sure we have it
+	 * and then fetch it.
+	 */
+	ND_TCHECK(*dat);
+	msg_type = *dat;
+	ND_PRINT((ndo, " aodv"));
+
+	switch (msg_type) {
 
-	switch (ap->rerr.rerr_type) {
 	case AODV_RREQ:
-		aodv_rreq(ap, dat, length, ip6);
+		if (is_ip6)
+			aodv_v6_rreq(ndo, dat, length);
+		else
+			aodv_rreq(ndo, dat, length);
 		break;
+
 	case AODV_RREP:
-		aodv_rrep(ap, dat, length, ip6);
+		if (is_ip6)
+			aodv_v6_rrep(ndo, dat, length);
+		else
+			aodv_rrep(ndo, dat, length);
 		break;
+
 	case AODV_RERR:
-		aodv_rerr(ap, length, ip6);
+		if (is_ip6)
+			aodv_v6_rerr(ndo, dat, length);
+		else
+			aodv_rerr(ndo, dat, length);
 		break;
+
 	case AODV_RREP_ACK:
-		printf(" rrep-ack %d", ap->rrep_ack.ra_type);
+		ND_PRINT((ndo, " rrep-ack %u", length));
+		break;
+
+	case AODV_V6_DRAFT_01_RREQ:
+		aodv_v6_draft_01_rreq(ndo, dat, length);
+		break;
+
+	case AODV_V6_DRAFT_01_RREP:
+		aodv_v6_draft_01_rrep(ndo, dat, length);
+		break;
+
+	case AODV_V6_DRAFT_01_RERR:
+		aodv_v6_draft_01_rerr(ndo, dat, length);
+		break;
+
+	case AODV_V6_DRAFT_01_RREP_ACK:
+		ND_PRINT((ndo, " rrep-ack %u", length));
 		break;
 
 	default:
-		printf(" %d %d", ap->rreq.rreq_type, length);
+		ND_PRINT((ndo, " type %u %u", msg_type, length));
 	}
+	return;
+
+trunc:
+	ND_PRINT((ndo, " [|aodv]"));
 }