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

diff --git a/print-rt6.c b/print-rt6.c
index 31da35ea..269496aa 100644
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -36,13 +36,13 @@
 #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 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;
 
@@ -51,12 +51,13 @@ rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2
 
 	ND_TCHECK(dp->ip6r_segleft);
 
-	len = dp->ip6r_len;
-	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) {
+	switch (type) {
 	case IPV6_RTHDR_TYPE_0:
 	case IPV6_RTHDR_TYPE_2:			/* Mobile IPv6 ID-20 */
 		dp0 = (const struct ip6_rthdr0 *)dp;