X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ff2bbd6ffe2ba25884e36f2bcc97fb156cf280e6..6d3b0e4599c5aa922bba42e53b038b51d9024a62:/print-ripng.c

diff --git a/print-ripng.c b/print-ripng.c
index a253655e..c4f4ea3a 100644
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -21,6 +21,8 @@
 
 /* \summary: IPv6 Routing Information Protocol (RIPng) printer */
 
+/* specification: RFC 2080 */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -65,7 +67,7 @@
 #define	RIP6_RESPONSE	2
 
 struct netinfo6 {
-	struct in6_addr	rip6_dest;
+	nd_ipv6		rip6_dest;
 	nd_uint16_t	rip6_tag;
 	nd_uint8_t	rip6_plen;
 	nd_uint8_t	rip6_metric;
@@ -75,62 +77,61 @@ struct	rip6 {
 	nd_uint8_t	rip6_cmd;
 	nd_uint8_t	rip6_vers;
 	nd_byte		rip6_res1[2];
-	union {
-		struct	netinfo6	ru6_nets[1];
-		nd_byte	ru6_tracefile[1];
-	} rip6un;
-#define	rip6_nets	rip6un.ru6_nets
-#define	rip6_tracefile	rip6un.ru6_tracefile
+	struct netinfo6	rip6_nets[1];
 };
 
 #define	HOPCNT_INFINITY6	16
 
-#if !defined(IN6_IS_ADDR_UNSPECIFIED) && !defined(_MSC_VER) /* MSVC inline */
-static int IN6_IS_ADDR_UNSPECIFIED(const struct in6_addr *addr)
+static int ND_IN6_IS_ADDR_UNSPECIFIED(const nd_ipv6 *addr)
 {
-    static const struct in6_addr in6addr_any;        /* :: */
-    return (memcmp(addr, &in6addr_any, sizeof(*addr)) == 0);
+    static const nd_ipv6 in6addr_any_val = { 0 };        /* :: */
+    return (memcmp(addr, &in6addr_any_val, sizeof(*addr)) == 0);
 }
-#endif
 
-static int
-rip6_entry_print(netdissect_options *ndo, const struct netinfo6 *ni, u_int metric)
+static void
+rip6_entry_print(netdissect_options *ndo,
+                 const struct netinfo6 *ni, const u_int print_metric)
 {
-	int l;
 	uint16_t tag;
+	uint8_t metric;
 
-	l = ND_PRINT("%s/%u", ip6addr_string(ndo, &ni->rip6_dest), EXTRACT_U_1(ni->rip6_plen));
-	tag = EXTRACT_BE_U_2(ni->rip6_tag);
+	ND_PRINT("%s/%u", GET_IP6ADDR_STRING(ni->rip6_dest),
+	         GET_U_1(ni->rip6_plen));
+	tag = GET_BE_U_2(ni->rip6_tag);
 	if (tag)
-		l += ND_PRINT(" [%u]", tag);
-	if (metric)
-		l += ND_PRINT(" (%u)", metric);
-	return l;
+		ND_PRINT(" [%u]", tag);
+	metric = GET_U_1(ni->rip6_metric);
+	if (metric && print_metric)
+		ND_PRINT(" (%u)", metric);
 }
 
 void
 ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
 {
 	const struct rip6 *rp = (const struct rip6 *)dat;
-	uint8_t cmd;
+	uint8_t cmd, vers;
 	const struct netinfo6 *ni;
 	unsigned int length_left;
 	u_int j;
 
-	ND_TCHECK_1(rp->rip6_cmd);
-	cmd = EXTRACT_U_1(rp->rip6_cmd);
+	ndo->ndo_protocol = "ripng";
+	vers = GET_U_1(rp->rip6_vers);
+	if (vers != RIP6_VERSION) {
+		ND_PRINT(" [vers %u]", vers);
+		goto invalid;
+	}
+	cmd = GET_U_1(rp->rip6_cmd);
 	switch (cmd) {
 
 	case RIP6_REQUEST:
 		length_left = length;
 		if (length_left < (sizeof(struct rip6) - sizeof(struct netinfo6)))
-			goto trunc;
+			goto invalid;
 		length_left -= (sizeof(struct rip6) - sizeof(struct netinfo6));
  		j = length_left / sizeof(*ni);
 		if (j == 1) {
-			ND_TCHECK_SIZE(rp->rip6_nets);
-			if (EXTRACT_U_1(rp->rip6_nets->rip6_metric) == HOPCNT_INFINITY6
-			    &&  IN6_IS_ADDR_UNSPECIFIED(&rp->rip6_nets->rip6_dest)) {
+			if (GET_U_1(rp->rip6_nets->rip6_metric) == HOPCNT_INFINITY6
+			    && ND_IN6_IS_ADDR_UNSPECIFIED(&rp->rip6_nets->rip6_dest)) {
 				ND_PRINT(" ripng-req dump");
 				break;
 			}
@@ -141,20 +142,19 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
 			ND_PRINT(" ripng-req %u:", j);
 		for (ni = rp->rip6_nets; length_left >= sizeof(*ni);
 		    length_left -= sizeof(*ni), ++ni) {
-			ND_TCHECK_SIZE(ni);
 			if (ndo->ndo_vflag > 1)
 				ND_PRINT("\n\t");
 			else
 				ND_PRINT(" ");
-			rip6_entry_print(ndo, ni, 0);
+			rip6_entry_print(ndo, ni, FALSE);
 		}
 		if (length_left != 0)
-			goto trunc;
+			goto invalid;
 		break;
 	case RIP6_RESPONSE:
 		length_left = length;
 		if (length_left < (sizeof(struct rip6) - sizeof(struct netinfo6)))
-			goto trunc;
+			goto invalid;
 		length_left -= (sizeof(struct rip6) - sizeof(struct netinfo6));
 		j = length_left / sizeof(*ni);
 		if (j * sizeof(*ni) != length_left)
@@ -163,26 +163,21 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
 			ND_PRINT(" ripng-resp %u:", j);
 		for (ni = rp->rip6_nets; length_left >= sizeof(*ni);
 		    length_left -= sizeof(*ni), ++ni) {
-			ND_TCHECK_SIZE(ni);
 			if (ndo->ndo_vflag > 1)
 				ND_PRINT("\n\t");
 			else
 				ND_PRINT(" ");
-			rip6_entry_print(ndo, ni, EXTRACT_U_1(ni->rip6_metric));
+			rip6_entry_print(ndo, ni, TRUE);
 		}
 		if (length_left != 0)
-			goto trunc;
+			goto invalid;
 		break;
 	default:
 		ND_PRINT(" ripng-%u ?? %u", cmd, length);
-		break;
+		goto invalid;
 	}
-	ND_TCHECK_1(rp->rip6_vers);
-	if (EXTRACT_U_1(rp->rip6_vers) != RIP6_VERSION)
-		ND_PRINT(" [vers %u]", EXTRACT_U_1(rp->rip6_vers));
 	return;
 
-trunc:
-	ND_PRINT("[|ripng]");
-	return;
+invalid:
+	nd_print_invalid(ndo);
 }