X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/69cb46af9119e8b5554bcc4bf1bf36f39cb82131..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index 8c1ff6a9..269496aa 100644
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,59 +19,53 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: IPv6 routing header printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef INET6
-
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include <string.h>
 
-#include "ip6.h"
-
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
+#include "ip6.h"
+
 int
-rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2 _U_)
+rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 {
-	register const struct ip6_rthdr *dp;
-	register const struct ip6_rthdr0 *dp0;
-	register const u_char *ep;
-	int i, len;
-	register const struct in6_addr *addr;
-	const struct in6_addr *last_addr = NULL;
+	const struct ip6_rthdr *dp;
+	const struct ip6_rthdr0 *dp0;
+	const u_char *ep;
+	u_int i, len, type;
+	const struct in6_addr *addr;
 
 	dp = (const struct ip6_rthdr *)bp;
-	len = dp->ip6r_len;
 
 	/* 'ep' points to the end of available data. */
 	ep = ndo->ndo_snapend;
 
 	ND_TCHECK(dp->ip6r_segleft);
 
-	ND_PRINT((ndo, "srcrt (len=%d", dp->ip6r_len));	/*)*/
-	ND_PRINT((ndo, ", type=%d", dp->ip6r_type));
-	ND_PRINT((ndo, ", segleft=%d", dp->ip6r_segleft));
+	len = EXTRACT_U_1(dp->ip6r_len);
+	ND_PRINT((ndo, "srcrt (len=%u", len));	/*)*/
+	type = EXTRACT_U_1(dp->ip6r_type);
+	ND_PRINT((ndo, ", type=%u", type));
+	ND_PRINT((ndo, ", segleft=%u", EXTRACT_U_1(dp->ip6r_segleft)));
 
-	switch (dp->ip6r_type) {
-#ifndef IPV6_RTHDR_TYPE_0
-#define IPV6_RTHDR_TYPE_0 0
-#endif
-#ifndef IPV6_RTHDR_TYPE_2
-#define IPV6_RTHDR_TYPE_2 2
-#endif
+	switch (type) {
 	case IPV6_RTHDR_TYPE_0:
 	case IPV6_RTHDR_TYPE_2:			/* Mobile IPv6 ID-20 */
 		dp0 = (const struct ip6_rthdr0 *)dp;
 
 		ND_TCHECK(dp0->ip6r0_reserved);
-		if (dp0->ip6r0_reserved || ndo->ndo_vflag) {
+		if (EXTRACT_BE_U_4(dp0->ip6r0_reserved) || ndo->ndo_vflag) {
 			ND_PRINT((ndo, ", rsv=0x%0x",
-			    EXTRACT_32BITS(&dp0->ip6r0_reserved)));
+			    EXTRACT_BE_U_4(dp0->ip6r0_reserved)));
 		}
 
 		if (len % 2 == 1)
@@ -83,20 +77,11 @@ rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2
 				goto trunc;
 
 			ND_PRINT((ndo, ", [%d]%s", i, ip6addr_string(ndo, addr)));
-			last_addr = addr;
 			addr++;
 		}
-		/*
-		 * the destination address used in the pseudo-header is that of the final
-		 * destination : the last address of the routing header
-		 */
-		if (last_addr != NULL) {
-			const struct ip6_hdr *ip6 = (const struct ip6_hdr *)bp2;
-			UNALIGNED_MEMCPY(&ip6->ip6_dst, last_addr, sizeof (struct in6_addr));
-		}
 		/*(*/
 		ND_PRINT((ndo, ") "));
-		return((dp0->ip6r0_len + 1) << 3);
+		return((EXTRACT_U_1(dp0->ip6r0_len) + 1) << 3);
 		break;
 	default:
 		goto trunc;
@@ -107,4 +92,3 @@ rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2
 	ND_PRINT((ndo, "[|srcrt]"));
 	return -1;
 }
-#endif /* INET6 */