X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/90528d4c391d02bb61ad3bfc3f38586b40126608..d2777156522f139a858bd6b5b51e364826bc95a7:/print-aodv.c

diff --git a/print-aodv.c b/print-aodv.c
index e47ff184..97421433 100644
--- a/print-aodv.c
+++ b/print-aodv.c
@@ -181,28 +181,30 @@ aodv_extension(netdissect_options *ndo,
 	const struct aodv_hello *ah;
 
 	ND_TCHECK_SIZE(ep);
-	switch (EXTRACT_U_1(ep->type)) {
+	switch (GET_U_1(ep->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("\n\text HELLO - bad length %u", EXTRACT_U_1(ep->length));
+		if (GET_U_1(ep->length) < 4) {
+			ND_PRINT("\n\text HELLO - bad length %u",
+				 GET_U_1(ep->length));
 			break;
 		}
 		ND_PRINT("\n\text HELLO %u ms",
-		    EXTRACT_BE_U_4(ah->interval));
+		    GET_BE_U_4(ah->interval));
 		break;
 
 	default:
-		ND_PRINT("\n\text %u %u", EXTRACT_U_1(ep->type), EXTRACT_U_1(ep->length));
+		ND_PRINT("\n\text %u %u", GET_U_1(ep->type),
+			 GET_U_1(ep->length));
 		break;
 	}
 	return;
 
 trunc:
-	ND_PRINT(" [|hello]");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -216,24 +218,24 @@ aodv_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 		goto trunc;
 	ND_PRINT(" 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),
-	    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(" [|rreq");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -247,21 +249,21 @@ aodv_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 		goto trunc;
 	ND_PRINT(" 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),
-	    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(" [|rreq");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -275,23 +277,23 @@ aodv_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
 	if (length < sizeof(*ap))
 		goto trunc;
 	ND_PRINT(" rerr %s [items %u] [%u]:",
-	    EXTRACT_U_1(ap->rerr_flags) & RERR_NODELETE ? "[D]" : "",
-	    EXTRACT_U_1(ap->rerr_dc), length);
+	    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--) {
+	for (dc = GET_U_1(ap->rerr_dc); dc != 0; dc--) {
 		ND_TCHECK_SIZE(dp);
 		if (i < sizeof(*dp))
 			goto trunc;
-		ND_PRINT(" {%s}(%u)", ipaddr_string(ndo, dp->u_da),
-		    EXTRACT_BE_U_4(dp->u_ds));
+		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("[|rerr]");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -305,24 +307,24 @@ aodv_v6_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 		goto trunc;
 	ND_PRINT(" v6 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));
+	    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(" [|rreq");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -336,21 +338,21 @@ aodv_v6_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 		goto trunc;
 	ND_PRINT(" 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));
+	    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(" [|rreq");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -364,23 +366,23 @@ aodv_v6_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
 	if (length < sizeof(*ap))
 		goto trunc;
 	ND_PRINT(" rerr %s [items %u] [%u]:",
-	    EXTRACT_U_1(ap->rerr_flags) & RERR_NODELETE ? "[D]" : "",
-	    EXTRACT_U_1(ap->rerr_dc), length);
+	    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--) {
+	for (dc = GET_U_1(ap->rerr_dc); dc != 0; dc--) {
 		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)", GET_IP6ADDR_STRING(dp6->u_da),
+			 GET_BE_U_4(dp6->u_ds));
 		dp6++;
 		i -= sizeof(*dp6);
 	}
 	return;
 
 trunc:
-	ND_PRINT("[|rerr]");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -394,24 +396,24 @@ aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 		goto trunc;
 	ND_PRINT(" 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));
+	    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(" [|rreq");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -425,21 +427,21 @@ aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 		goto trunc;
 	ND_PRINT(" 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));
+	    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(" [|rreq");
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -453,23 +455,23 @@ aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
 	if (length < sizeof(*ap))
 		goto trunc;
 	ND_PRINT(" rerr %s [items %u] [%u]:",
-	    EXTRACT_U_1(ap->rerr_flags) & RERR_NODELETE ? "[D]" : "",
-	    EXTRACT_U_1(ap->rerr_dc), length);
+	    GET_U_1(ap->rerr_flags) & RERR_NODELETE ? "[D]" : "",
+	    GET_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--) {
+	for (dc = GET_U_1(ap->rerr_dc); dc != 0; dc--) {
 		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)", GET_IP6ADDR_STRING(dp6->u_da),
+			 GET_BE_U_4(dp6->u_ds));
 		dp6++;
 		i -= sizeof(*dp6);
 	}
 	return;
 
 trunc:
-	ND_PRINT("[|rerr]");
+	nd_print_trunc(ndo);
 }
 
 void
@@ -478,12 +480,12 @@ 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.
 	 */
-	ND_TCHECK_1(dat);
-	msg_type = EXTRACT_U_1(dat);
+	msg_type = GET_U_1(dat);
 	ND_PRINT(" aodv");
 
 	switch (msg_type) {
@@ -532,8 +534,4 @@ aodv_print(netdissect_options *ndo,
 	default:
 		ND_PRINT(" type %u %u", msg_type, length);
 	}
-	return;
-
-trunc:
-	ND_PRINT(" [|aodv]");
 }