X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/57b0a999a9fafc936e2a4876cb27624c3cd58568..a8abce5c5e2dce2ba6dbccd5d3829da104b80f9c:/print-ripng.c

diff --git a/print-ripng.c b/print-ripng.c
index fd78342b..15a9aff7 100644
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -22,10 +22,10 @@
 /* \summary: IPv6 Routing Information Protocol (RIPng) printer */
 
 #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"
@@ -65,7 +65,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;
@@ -85,13 +85,11 @@ struct	rip6 {
 
 #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 struct in6_addr in6addr_any_val;        /* :: */
+    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)
@@ -99,7 +97,8 @@ rip6_entry_print(netdissect_options *ndo, const struct netinfo6 *ni, u_int metri
 	int l;
 	uint16_t tag;
 
-	l = ND_PRINT("%s/%u", ip6addr_string(ndo, &ni->rip6_dest), EXTRACT_U_1(ni->rip6_plen));
+	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);
 	if (tag)
 		l += ND_PRINT(" [%u]", tag);
@@ -117,6 +116,7 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
 	unsigned int length_left;
 	u_int j;
 
+	ndo->ndo_protocol = "ripng";
 	ND_TCHECK_1(rp->rip6_cmd);
 	cmd = EXTRACT_U_1(rp->rip6_cmd);
 	switch (cmd) {
@@ -128,9 +128,9 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
 		length_left -= (sizeof(struct rip6) - sizeof(struct netinfo6));
  		j = length_left / sizeof(*ni);
 		if (j == 1) {
-			ND_TCHECK(rp->rip6_nets);
+			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)) {
+			    && ND_IN6_IS_ADDR_UNSPECIFIED(&rp->rip6_nets->rip6_dest)) {
 				ND_PRINT(" ripng-req dump");
 				break;
 			}
@@ -183,6 +183,6 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
 	return;
 
 trunc:
-	ND_PRINT("[|ripng]");
+	nd_print_trunc(ndo);
 	return;
 }