X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fb2479d733dbe8a991d11909b319341f7db62ab1..cc2d4cbd8ca150504127f375d8b51b194958d95b:/print-aodv.c

diff --git a/print-aodv.c b/print-aodv.c
index b716097a..17942bce 100644
--- a/print-aodv.c
+++ b/print-aodv.c
@@ -51,9 +51,9 @@ struct aodv_rreq {
 	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,9 +62,9 @@ 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_ipv6		rreq_da;	/* destination IPv6 address */
 	nd_uint32_t	rreq_ds;	/* destination sequence number */
-	struct in6_addr	rreq_oa;	/* originator IPv6 address */
+	nd_ipv6		rreq_oa;	/* originator IPv6 address */
 	nd_uint32_t	rreq_os;	/* originator sequence number */
 };
 struct aodv_rreq6_draft_01 {
@@ -75,8 +75,8 @@ struct aodv_rreq6_draft_01 {
 	nd_uint32_t	rreq_id;	/* request ID */
 	nd_uint32_t	rreq_ds;	/* destination sequence number */
 	nd_uint32_t	rreq_os;	/* originator sequence number */
-	struct in6_addr	rreq_da;	/* destination IPv6 address */
-	struct in6_addr	rreq_oa;	/* originator IPv6 address */
+	nd_ipv6		rreq_da;	/* destination IPv6 address */
+	nd_ipv6		rreq_oa;	/* originator IPv6 address */
 };
 
 #define	RREQ_JOIN	0x80		/* join (reserved for multicast */
@@ -91,9 +91,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,9 +101,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_ipv6		rrep_oa;	/* originator IPv6 address */
 	nd_uint32_t	rrep_life;	/* lifetime of this route */
 };
 struct aodv_rrep6_draft_01 {
@@ -112,8 +112,8 @@ struct aodv_rrep6_draft_01 {
 	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_da;	/* destination IPv6 address */
+	nd_ipv6		rrep_oa;	/* originator IPv6 address */
 	nd_uint32_t	rrep_life;	/* lifetime of this route */
 };
 
@@ -123,15 +123,15 @@ 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_ipv6		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 */
 };
 
@@ -202,7 +202,7 @@ aodv_extension(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT(" [|hello]");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -223,9 +223,9 @@ aodv_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 	    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),
+	    ipaddr_string(ndo, ap->rreq_da),
 	    EXTRACT_BE_U_4(ap->rreq_ds),
-	    ipaddr_string(ndo, &ap->rreq_oa),
+	    ipaddr_string(ndo, ap->rreq_oa),
 	    EXTRACT_BE_U_4(ap->rreq_os));
 	i = length - sizeof(*ap);
 	if (i >= sizeof(struct aodv_ext))
@@ -233,7 +233,7 @@ aodv_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 	return;
 
 trunc:
-	ND_PRINT(" [|rreq");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -251,9 +251,9 @@ aodv_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 	    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),
+	    ipaddr_string(ndo, ap->rrep_da),
 	    EXTRACT_BE_U_4(ap->rrep_ds),
-	    ipaddr_string(ndo, &ap->rrep_oa),
+	    ipaddr_string(ndo, ap->rrep_oa),
 	    EXTRACT_BE_U_4(ap->rrep_life));
 	i = length - sizeof(*ap);
 	if (i >= sizeof(struct aodv_ext))
@@ -261,7 +261,7 @@ aodv_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 	return;
 
 trunc:
-	ND_PRINT(" [|rreq");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -283,7 +283,7 @@ aodv_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
 		ND_TCHECK_SIZE(dp);
 		if (i < sizeof(*dp))
 			goto trunc;
-		ND_PRINT(" {%s}(%u)", ipaddr_string(ndo, &dp->u_da),
+		ND_PRINT(" {%s}(%u)", ipaddr_string(ndo, dp->u_da),
 		    EXTRACT_BE_U_4(dp->u_ds));
 		dp++;
 		i -= sizeof(*dp);
@@ -291,7 +291,7 @@ aodv_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
 	return;
 
 trunc:
-	ND_PRINT("[|rerr]");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -312,9 +312,9 @@ aodv_v6_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 	    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),
+	    ip6addr_string(ndo, ap->rreq_da),
 	    EXTRACT_BE_U_4(ap->rreq_ds),
-	    ip6addr_string(ndo, &ap->rreq_oa),
+	    ip6addr_string(ndo, ap->rreq_oa),
 	    EXTRACT_BE_U_4(ap->rreq_os));
 	i = length - sizeof(*ap);
 	if (i >= sizeof(struct aodv_ext))
@@ -322,7 +322,7 @@ aodv_v6_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 	return;
 
 trunc:
-	ND_PRINT(" [|rreq");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -340,9 +340,9 @@ aodv_v6_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 	    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),
+	    ip6addr_string(ndo, ap->rrep_da),
 	    EXTRACT_BE_U_4(ap->rrep_ds),
-	    ip6addr_string(ndo, &ap->rrep_oa),
+	    ip6addr_string(ndo, ap->rrep_oa),
 	    EXTRACT_BE_U_4(ap->rrep_life));
 	i = length - sizeof(*ap);
 	if (i >= sizeof(struct aodv_ext))
@@ -350,7 +350,7 @@ aodv_v6_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 	return;
 
 trunc:
-	ND_PRINT(" [|rreq");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -372,15 +372,15 @@ aodv_v6_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
 		ND_TCHECK_SIZE(dp6);
 		if (i < sizeof(*dp6))
 			goto trunc;
-		ND_PRINT(" {%s}(%u)", ip6addr_string(ndo, &dp6->u_da),
-		    EXTRACT_BE_U_4(dp6->u_ds));
+		ND_PRINT(" {%s}(%u)", ip6addr_string(ndo, dp6->u_da),
+			 EXTRACT_BE_U_4(dp6->u_ds));
 		dp6++;
 		i -= sizeof(*dp6);
 	}
 	return;
 
 trunc:
-	ND_PRINT("[|rerr]");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -401,9 +401,9 @@ aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 	    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),
+	    ip6addr_string(ndo, ap->rreq_da),
 	    EXTRACT_BE_U_4(ap->rreq_ds),
-	    ip6addr_string(ndo, &ap->rreq_oa),
+	    ip6addr_string(ndo, ap->rreq_oa),
 	    EXTRACT_BE_U_4(ap->rreq_os));
 	i = length - sizeof(*ap);
 	if (i >= sizeof(struct aodv_ext))
@@ -411,7 +411,7 @@ aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 	return;
 
 trunc:
-	ND_PRINT(" [|rreq");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -429,9 +429,9 @@ aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 	    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),
+	    ip6addr_string(ndo, ap->rrep_da),
 	    EXTRACT_BE_U_4(ap->rrep_ds),
-	    ip6addr_string(ndo, &ap->rrep_oa),
+	    ip6addr_string(ndo, ap->rrep_oa),
 	    EXTRACT_BE_U_4(ap->rrep_life));
 	i = length - sizeof(*ap);
 	if (i >= sizeof(struct aodv_ext))
@@ -439,7 +439,7 @@ aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 	return;
 
 trunc:
-	ND_PRINT(" [|rreq");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -461,15 +461,15 @@ aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
 		ND_TCHECK_SIZE(dp6);
 		if (i < sizeof(*dp6))
 			goto trunc;
-		ND_PRINT(" {%s}(%u)", ip6addr_string(ndo, &dp6->u_da),
-		    EXTRACT_BE_U_4(dp6->u_ds));
+		ND_PRINT(" {%s}(%u)", ip6addr_string(ndo, dp6->u_da),
+			 EXTRACT_BE_U_4(dp6->u_ds));
 		dp6++;
 		i -= sizeof(*dp6);
 	}
 	return;
 
 trunc:
-	ND_PRINT("[|rerr]");
+	nd_print_trunc(ndo);
 }
 
 void
@@ -478,6 +478,7 @@ aodv_print(netdissect_options *ndo,
 {
 	uint8_t msg_type;
 
+	ndo->ndo_protocol = "aodv";
 	/*
 	 * The message type is the first byte; make sure we have it
 	 * and then fetch it.
@@ -535,5 +536,5 @@ aodv_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT(" [|aodv]");
+	nd_print_trunc(ndo);
 }