X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d526e47658b691c4b5ca0d29759d1f67b7fb037b..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/print-aodv.c

diff --git a/print-aodv.c b/print-aodv.c
index 60a295dc..b014c49c 100644
--- a/print-aodv.c
+++ b/print-aodv.c
@@ -31,29 +31,27 @@
  */
 
 /* \summary: Ad hoc On-Demand Distance Vector (AODV) Routing printer */
+/* specification: RFC 3561 */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
-/*
- * RFC 3561
- */
 struct aodv_rreq {
 	nd_uint8_t	rreq_type;	/* AODV message type (1) */
 	nd_uint8_t	rreq_flags;	/* various flags */
 	nd_uint8_t	rreq_zero0;	/* reserved, set to zero */
 	nd_uint8_t	rreq_hops;	/* number of hops from originator */
 	nd_uint32_t	rreq_id;	/* request ID */
-	nd_uint32_t	rreq_da;	/* destination IPv4 address */
+	nd_ipv4		rreq_da;	/* destination IPv4 address */
 	nd_uint32_t	rreq_ds;	/* destination sequence number */
-	nd_uint32_t	rreq_oa;	/* originator IPv4 address */
+	nd_ipv4		rreq_oa;	/* originator IPv4 address */
 	nd_uint32_t	rreq_os;	/* originator sequence number */
 };
 struct aodv_rreq6 {
@@ -62,21 +60,10 @@ struct aodv_rreq6 {
 	nd_uint8_t	rreq_zero0;	/* reserved, set to zero */
 	nd_uint8_t	rreq_hops;	/* number of hops from originator */
 	nd_uint32_t	rreq_id;	/* request ID */
-	struct in6_addr	rreq_da;	/* destination IPv6 address */
-	nd_uint32_t	rreq_ds;	/* destination sequence number */
-	struct in6_addr	rreq_oa;	/* originator IPv6 address */
-	nd_uint32_t	rreq_os;	/* originator sequence number */
-};
-struct aodv_rreq6_draft_01 {
-	nd_uint8_t	rreq_type;	/* AODV message type (16) */
-	nd_uint8_t	rreq_flags;	/* various flags */
-	nd_uint8_t	rreq_zero0;	/* reserved, set to zero */
-	nd_uint8_t	rreq_hops;	/* number of hops from originator */
-	nd_uint32_t	rreq_id;	/* request ID */
+	nd_ipv6		rreq_da;	/* destination IPv6 address */
 	nd_uint32_t	rreq_ds;	/* destination sequence number */
+	nd_ipv6		rreq_oa;	/* originator IPv6 address */
 	nd_uint32_t	rreq_os;	/* originator sequence number */
-	struct in6_addr	rreq_da;	/* destination IPv6 address */
-	struct in6_addr	rreq_oa;	/* originator IPv6 address */
 };
 
 #define	RREQ_JOIN	0x80		/* join (reserved for multicast */
@@ -91,9 +78,9 @@ struct aodv_rrep {
 	nd_uint8_t	rrep_flags;	/* various flags */
 	nd_uint8_t	rrep_ps;	/* prefix size */
 	nd_uint8_t	rrep_hops;	/* number of hops from o to d */
-	nd_uint32_t	rrep_da;	/* destination IPv4 address */
+	nd_ipv4		rrep_da;	/* destination IPv4 address */
 	nd_uint32_t	rrep_ds;	/* destination sequence number */
-	nd_uint32_t	rrep_oa;	/* originator IPv4 address */
+	nd_ipv4		rrep_oa;	/* originator IPv4 address */
 	nd_uint32_t	rrep_life;	/* lifetime of this route */
 };
 struct aodv_rrep6 {
@@ -101,19 +88,9 @@ struct aodv_rrep6 {
 	nd_uint8_t	rrep_flags;	/* various flags */
 	nd_uint8_t	rrep_ps;	/* prefix size */
 	nd_uint8_t	rrep_hops;	/* number of hops from o to d */
-	struct in6_addr	rrep_da;	/* destination IPv6 address */
+	nd_ipv6		rrep_da;	/* destination IPv6 address */
 	nd_uint32_t	rrep_ds;	/* destination sequence number */
-	struct in6_addr	rrep_oa;	/* originator IPv6 address */
-	nd_uint32_t	rrep_life;	/* lifetime of this route */
-};
-struct aodv_rrep6_draft_01 {
-	nd_uint8_t	rrep_type;	/* AODV message type (17) */
-	nd_uint8_t	rrep_flags;	/* various flags */
-	nd_uint8_t	rrep_ps;	/* prefix size */
-	nd_uint8_t	rrep_hops;	/* number of hops from o to d */
-	nd_uint32_t	rrep_ds;	/* destination sequence number */
-	struct in6_addr	rrep_da;	/* destination IPv6 address */
-	struct in6_addr	rrep_oa;	/* originator IPv6 address */
+	nd_ipv6		rrep_oa;	/* originator IPv6 address */
 	nd_uint32_t	rrep_life;	/* lifetime of this route */
 };
 
@@ -123,15 +100,11 @@ struct aodv_rrep6_draft_01 {
 #define	RREP_PREFIX_MASK	0x1F	/* mask for prefix size */
 
 struct rerr_unreach {
-	nd_uint32_t	u_da;	/* IPv4 address */
+	nd_ipv4		u_da;	/* IPv4 address */
 	nd_uint32_t	u_ds;	/* sequence number */
 };
 struct rerr_unreach6 {
-	struct in6_addr	u_da;	/* IPv6 address */
-	nd_uint32_t	u_ds;	/* sequence number */
-};
-struct rerr_unreach6_draft_01 {
-	struct in6_addr	u_da;	/* IPv6 address */
+	nd_ipv6		u_da;	/* IPv6 address */
 	nd_uint32_t	u_ds;	/* sequence number */
 };
 
@@ -154,11 +127,13 @@ struct aodv_rrep_ack {
 #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 */
+static const struct tok msg_type_str[] = {
+	{ AODV_RREQ,     "rreq" },
+	{ AODV_RREP,     "rrep" },
+	{ AODV_RERR,     "rerr" },
+	{ AODV_RREP_ACK, "rrep-ack" },
+	{ 0, NULL }
+};
 
 struct aodv_ext {
 	nd_uint8_t	type;		/* extension type */
@@ -179,30 +154,31 @@ aodv_extension(netdissect_options *ndo,
                const struct aodv_ext *ep, u_int length)
 {
 	const struct aodv_hello *ah;
+	uint8_t ext_type, ext_length;
 
-	ND_TCHECK_SIZE(ep);
-	switch (EXTRACT_U_1(ep->type)) {
+	ext_type = GET_U_1(ep->type);
+	ext_length = GET_U_1(ep->length);
+	switch (ext_type) {
 	case AODV_EXT_HELLO:
 		ah = (const struct aodv_hello *)(const void *)ep;
-		ND_TCHECK_SIZE(ah);
-		if (length < sizeof(struct aodv_hello))
-			goto trunc;
-		if (EXTRACT_U_1(ep->length) < 4) {
-			ND_PRINT((ndo, "\n\text HELLO - bad length %u", EXTRACT_U_1(ep->length)));
-			break;
+		ND_ICHECKMSG_ZU("ext data length", length, <,
+				sizeof(struct aodv_hello));
+		if (ext_length < 4) {
+			ND_PRINT("\n\text HELLO - bad length %u", ext_length);
+			goto invalid;
 		}
-		ND_PRINT((ndo, "\n\text HELLO %u ms",
-		    EXTRACT_BE_U_4(ah->interval)));
+		ND_PRINT("\n\text HELLO %u ms",
+		    GET_BE_U_4(ah->interval));
 		break;
 
 	default:
-		ND_PRINT((ndo, "\n\text %u %u", EXTRACT_U_1(ep->type), EXTRACT_U_1(ep->length)));
+		ND_PRINT("\n\text %u %u", ext_type, ext_length);
 		break;
 	}
 	return;
 
-trunc:
-	ND_PRINT((ndo, " [|hello]"));
+invalid:
+	nd_print_invalid(ndo);
 }
 
 static void
@@ -211,29 +187,27 @@ 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;
 
-	ND_TCHECK_SIZE(ap);
-	if (length < sizeof(*ap))
-		goto trunc;
-	ND_PRINT((ndo, " rreq %u %s%s%s%s%shops %u id 0x%08x\n"
+	ND_ICHECKMSG_ZU("message length", length, <, sizeof(*ap));
+	ND_PRINT(" %u %s%s%s%s%shops %u id 0x%08x\n"
 	    "\tdst %s seq %u src %s seq %u", length,
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_JOIN ? "[J]" : "",
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_REPAIR ? "[R]" : "",
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_GRAT ? "[G]" : "",
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_DEST ? "[D]" : "",
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_UNKNOWN ? "[U] " : " ",
-	    EXTRACT_U_1(ap->rreq_hops),
-	    EXTRACT_BE_U_4(ap->rreq_id),
-	    ipaddr_string(ndo, &ap->rreq_da),
-	    EXTRACT_BE_U_4(ap->rreq_ds),
-	    ipaddr_string(ndo, &ap->rreq_oa),
-	    EXTRACT_BE_U_4(ap->rreq_os)));
+	    GET_U_1(ap->rreq_type) & RREQ_JOIN ? "[J]" : "",
+	    GET_U_1(ap->rreq_type) & RREQ_REPAIR ? "[R]" : "",
+	    GET_U_1(ap->rreq_type) & RREQ_GRAT ? "[G]" : "",
+	    GET_U_1(ap->rreq_type) & RREQ_DEST ? "[D]" : "",
+	    GET_U_1(ap->rreq_type) & RREQ_UNKNOWN ? "[U] " : " ",
+	    GET_U_1(ap->rreq_hops),
+	    GET_BE_U_4(ap->rreq_id),
+	    GET_IPADDR_STRING(ap->rreq_da),
+	    GET_BE_U_4(ap->rreq_ds),
+	    GET_IPADDR_STRING(ap->rreq_oa),
+	    GET_BE_U_4(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"));
+invalid:
+	nd_print_invalid(ndo);
 }
 
 static void
@@ -242,26 +216,24 @@ 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_SIZE(ap);
-	if (length < sizeof(*ap))
-		goto trunc;
-	ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n"
+	ND_ICHECKMSG_ZU("message length", length, <, sizeof(*ap));
+	ND_PRINT(" %u %s%sprefix %u hops %u\n"
 	    "\tdst %s dseq %u src %s %u ms", length,
-	    EXTRACT_U_1(ap->rrep_type) & RREP_REPAIR ? "[R]" : "",
-	    EXTRACT_U_1(ap->rrep_type) & RREP_ACK ? "[A] " : " ",
-	    EXTRACT_U_1(ap->rrep_ps) & RREP_PREFIX_MASK,
-	    EXTRACT_U_1(ap->rrep_hops),
-	    ipaddr_string(ndo, &ap->rrep_da),
-	    EXTRACT_BE_U_4(ap->rrep_ds),
-	    ipaddr_string(ndo, &ap->rrep_oa),
-	    EXTRACT_BE_U_4(ap->rrep_life)));
+	    GET_U_1(ap->rrep_type) & RREP_REPAIR ? "[R]" : "",
+	    GET_U_1(ap->rrep_type) & RREP_ACK ? "[A] " : " ",
+	    GET_U_1(ap->rrep_ps) & RREP_PREFIX_MASK,
+	    GET_U_1(ap->rrep_hops),
+	    GET_IPADDR_STRING(ap->rrep_da),
+	    GET_BE_U_4(ap->rrep_ds),
+	    GET_IPADDR_STRING(ap->rrep_oa),
+	    GET_BE_U_4(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"));
+invalid:
+	nd_print_invalid(ndo);
 }
 
 static void
@@ -271,27 +243,23 @@ aodv_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
 	const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
 	const struct rerr_unreach *dp;
 
-	ND_TCHECK_SIZE(ap);
-	if (length < sizeof(*ap))
-		goto trunc;
-	ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
-	    EXTRACT_U_1(ap->rerr_flags) & RERR_NODELETE ? "[D]" : "",
-	    EXTRACT_U_1(ap->rerr_dc), length));
+	ND_ICHECKMSG_ZU("message length", length, <, sizeof(*ap));
+	ND_PRINT(" %s [items %u] [%u]:",
+	    GET_U_1(ap->rerr_flags) & RERR_NODELETE ? "[D]" : "",
+	    GET_U_1(ap->rerr_dc), length);
 	dp = (const struct rerr_unreach *)(dat + sizeof(*ap));
 	i = length - sizeof(*ap);
-	for (dc = EXTRACT_U_1(ap->rerr_dc); dc != 0; dc--) {
-		ND_TCHECK_SIZE(dp);
-		if (i < sizeof(*dp))
-			goto trunc;
-		ND_PRINT((ndo, " {%s}(%u)", ipaddr_string(ndo, &dp->u_da),
-		    EXTRACT_BE_U_4(dp->u_ds)));
+	for (dc = GET_U_1(ap->rerr_dc); dc != 0; dc--) {
+		ND_ICHECKMSG_ZU("remaining length", i, <, sizeof(*dp));
+		ND_PRINT(" {%s}(%u)", GET_IPADDR_STRING(dp->u_da),
+		    GET_BE_U_4(dp->u_ds));
 		dp++;
 		i -= sizeof(*dp);
 	}
 	return;
 
-trunc:
-	ND_PRINT((ndo, "[|rerr]"));
+invalid:
+	nd_print_invalid(ndo);
 }
 
 static void
@@ -300,29 +268,27 @@ aodv_v6_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 	u_int i;
 	const struct aodv_rreq6 *ap = (const struct aodv_rreq6 *)dat;
 
-	ND_TCHECK_SIZE(ap);
-	if (length < sizeof(*ap))
-		goto trunc;
-	ND_PRINT((ndo, " v6 rreq %u %s%s%s%s%shops %u id 0x%08x\n"
+	ND_ICHECKMSG_ZU("message length", length, <, sizeof(*ap));
+	ND_PRINT(" %u %s%s%s%s%shops %u id 0x%08x\n"
 	    "\tdst %s seq %u src %s seq %u", length,
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_JOIN ? "[J]" : "",
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_REPAIR ? "[R]" : "",
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_GRAT ? "[G]" : "",
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_DEST ? "[D]" : "",
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_UNKNOWN ? "[U] " : " ",
-	    EXTRACT_U_1(ap->rreq_hops),
-	    EXTRACT_BE_U_4(ap->rreq_id),
-	    ip6addr_string(ndo, &ap->rreq_da),
-	    EXTRACT_BE_U_4(ap->rreq_ds),
-	    ip6addr_string(ndo, &ap->rreq_oa),
-	    EXTRACT_BE_U_4(ap->rreq_os)));
+	    GET_U_1(ap->rreq_type) & RREQ_JOIN ? "[J]" : "",
+	    GET_U_1(ap->rreq_type) & RREQ_REPAIR ? "[R]" : "",
+	    GET_U_1(ap->rreq_type) & RREQ_GRAT ? "[G]" : "",
+	    GET_U_1(ap->rreq_type) & RREQ_DEST ? "[D]" : "",
+	    GET_U_1(ap->rreq_type) & RREQ_UNKNOWN ? "[U] " : " ",
+	    GET_U_1(ap->rreq_hops),
+	    GET_BE_U_4(ap->rreq_id),
+	    GET_IP6ADDR_STRING(ap->rreq_da),
+	    GET_BE_U_4(ap->rreq_ds),
+	    GET_IP6ADDR_STRING(ap->rreq_oa),
+	    GET_BE_U_4(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"));
+invalid:
+	nd_print_invalid(ndo);
 }
 
 static void
@@ -331,26 +297,24 @@ aodv_v6_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 	u_int i;
 	const struct aodv_rrep6 *ap = (const struct aodv_rrep6 *)dat;
 
-	ND_TCHECK_SIZE(ap);
-	if (length < sizeof(*ap))
-		goto trunc;
-	ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n"
+	ND_ICHECKMSG_ZU("message length", length, <, sizeof(*ap));
+	ND_PRINT(" %u %s%sprefix %u hops %u\n"
 	   "\tdst %s dseq %u src %s %u ms", length,
-	    EXTRACT_U_1(ap->rrep_type) & RREP_REPAIR ? "[R]" : "",
-	    EXTRACT_U_1(ap->rrep_type) & RREP_ACK ? "[A] " : " ",
-	    EXTRACT_U_1(ap->rrep_ps) & RREP_PREFIX_MASK,
-	    EXTRACT_U_1(ap->rrep_hops),
-	    ip6addr_string(ndo, &ap->rrep_da),
-	    EXTRACT_BE_U_4(ap->rrep_ds),
-	    ip6addr_string(ndo, &ap->rrep_oa),
-	    EXTRACT_BE_U_4(ap->rrep_life)));
+	    GET_U_1(ap->rrep_type) & RREP_REPAIR ? "[R]" : "",
+	    GET_U_1(ap->rrep_type) & RREP_ACK ? "[A] " : " ",
+	    GET_U_1(ap->rrep_ps) & RREP_PREFIX_MASK,
+	    GET_U_1(ap->rrep_hops),
+	    GET_IP6ADDR_STRING(ap->rrep_da),
+	    GET_BE_U_4(ap->rrep_ds),
+	    GET_IP6ADDR_STRING(ap->rrep_oa),
+	    GET_BE_U_4(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"));
+invalid:
+	nd_print_invalid(ndo);
 }
 
 static void
@@ -360,116 +324,23 @@ aodv_v6_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
 	const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
 	const struct rerr_unreach6 *dp6;
 
-	ND_TCHECK_SIZE(ap);
-	if (length < sizeof(*ap))
-		goto trunc;
-	ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
-	    EXTRACT_U_1(ap->rerr_flags) & RERR_NODELETE ? "[D]" : "",
-	    EXTRACT_U_1(ap->rerr_dc), length));
+	ND_ICHECKMSG_ZU("message length", length, <, sizeof(*ap));
+	ND_PRINT(" %s [items %u] [%u]:",
+	    GET_U_1(ap->rerr_flags) & RERR_NODELETE ? "[D]" : "",
+	    GET_U_1(ap->rerr_dc), length);
 	dp6 = (const struct rerr_unreach6 *)(const void *)(ap + 1);
 	i = length - sizeof(*ap);
-	for (dc = EXTRACT_U_1(ap->rerr_dc); dc != 0; dc--) {
-		ND_TCHECK_SIZE(dp6);
-		if (i < sizeof(*dp6))
-			goto trunc;
-		ND_PRINT((ndo, " {%s}(%u)", ip6addr_string(ndo, &dp6->u_da),
-		    EXTRACT_BE_U_4(dp6->u_ds)));
-		dp6++;
-		i -= sizeof(*dp6);
-	}
-	return;
-
-trunc:
-	ND_PRINT((ndo, "[|rerr]"));
-}
-
-static void
-aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
-{
-	u_int i;
-	const struct aodv_rreq6_draft_01 *ap = (const struct aodv_rreq6_draft_01 *)dat;
-
-	ND_TCHECK_SIZE(ap);
-	if (length < sizeof(*ap))
-		goto trunc;
-	ND_PRINT((ndo, " rreq %u %s%s%s%s%shops %u id 0x%08x\n"
-	    "\tdst %s seq %u src %s seq %u", length,
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_JOIN ? "[J]" : "",
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_REPAIR ? "[R]" : "",
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_GRAT ? "[G]" : "",
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_DEST ? "[D]" : "",
-	    EXTRACT_U_1(ap->rreq_type) & RREQ_UNKNOWN ? "[U] " : " ",
-	    EXTRACT_U_1(ap->rreq_hops),
-	    EXTRACT_BE_U_4(ap->rreq_id),
-	    ip6addr_string(ndo, &ap->rreq_da),
-	    EXTRACT_BE_U_4(ap->rreq_ds),
-	    ip6addr_string(ndo, &ap->rreq_oa),
-	    EXTRACT_BE_U_4(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_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
-{
-	u_int i;
-	const struct aodv_rrep6_draft_01 *ap = (const struct aodv_rrep6_draft_01 *)dat;
-
-	ND_TCHECK_SIZE(ap);
-	if (length < sizeof(*ap))
-		goto trunc;
-	ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n"
-	   "\tdst %s dseq %u src %s %u ms", length,
-	    EXTRACT_U_1(ap->rrep_type) & RREP_REPAIR ? "[R]" : "",
-	    EXTRACT_U_1(ap->rrep_type) & RREP_ACK ? "[A] " : " ",
-	    EXTRACT_U_1(ap->rrep_ps) & RREP_PREFIX_MASK,
-	    EXTRACT_U_1(ap->rrep_hops),
-	    ip6addr_string(ndo, &ap->rrep_da),
-	    EXTRACT_BE_U_4(ap->rrep_ds),
-	    ip6addr_string(ndo, &ap->rrep_oa),
-	    EXTRACT_BE_U_4(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_v6_draft_01_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_unreach6_draft_01 *dp6;
-
-	ND_TCHECK_SIZE(ap);
-	if (length < sizeof(*ap))
-		goto trunc;
-	ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
-	    EXTRACT_U_1(ap->rerr_flags) & RERR_NODELETE ? "[D]" : "",
-	    EXTRACT_U_1(ap->rerr_dc), length));
-	dp6 = (const struct rerr_unreach6_draft_01 *)(const void *)(ap + 1);
-	i = length - sizeof(*ap);
-	for (dc = EXTRACT_U_1(ap->rerr_dc); dc != 0; dc--) {
-		ND_TCHECK_SIZE(dp6);
-		if (i < sizeof(*dp6))
-			goto trunc;
-		ND_PRINT((ndo, " {%s}(%u)", ip6addr_string(ndo, &dp6->u_da),
-		    EXTRACT_BE_U_4(dp6->u_ds)));
+	for (dc = GET_U_1(ap->rerr_dc); dc != 0; dc--) {
+		ND_ICHECKMSG_ZU("remaining length", i, <, sizeof(*dp6));
+		ND_PRINT(" {%s}(%u)", GET_IP6ADDR_STRING(dp6->u_da),
+			 GET_BE_U_4(dp6->u_ds));
 		dp6++;
 		i -= sizeof(*dp6);
 	}
 	return;
 
-trunc:
-	ND_PRINT((ndo, "[|rerr]"));
+invalid:
+	nd_print_invalid(ndo);
 }
 
 void
@@ -478,13 +349,15 @@ aodv_print(netdissect_options *ndo,
 {
 	uint8_t msg_type;
 
+	ndo->ndo_protocol = "aodv";
+	ND_PRINT(" aodv");
+
 	/*
 	 * The message type is the first byte; make sure we have it
 	 * and then fetch it.
 	 */
-	ND_TCHECK_1(dat);
-	msg_type = EXTRACT_U_1(dat);
-	ND_PRINT((ndo, " aodv"));
+	msg_type = GET_U_1(dat);
+	ND_PRINT(" %s", tok2str(msg_type_str, "type %u", msg_type));
 
 	switch (msg_type) {
 
@@ -510,30 +383,10 @@ aodv_print(netdissect_options *ndo,
 		break;
 
 	case AODV_RREP_ACK:
-		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));
+		ND_PRINT(" %u", length);
 		break;
 
 	default:
-		ND_PRINT((ndo, " type %u %u", msg_type, length));
+		ND_PRINT(" %u", length);
 	}
-	return;
-
-trunc:
-	ND_PRINT((ndo, " [|aodv]"));
 }