X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/32e24ead3b2a171e5f5eff50d7231c2514eda9b4..a37ced67021c5f4afb14cfc26dd5fee115c78d33:/print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index ab279876..a6886f94 100644
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -49,11 +49,11 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 
 	ND_TCHECK_1(dp->ip6r_segleft);
 
-	len = EXTRACT_U_1(dp->ip6r_len);
+	len = GET_U_1(dp->ip6r_len);
 	ND_PRINT("srcrt (len=%u", len);	/*)*/
-	type = EXTRACT_U_1(dp->ip6r_type);
+	type = GET_U_1(dp->ip6r_type);
 	ND_PRINT(", type=%u", type);
-	ND_PRINT(", segleft=%u", EXTRACT_U_1(dp->ip6r_segleft));
+	ND_PRINT(", segleft=%u", GET_U_1(dp->ip6r_segleft));
 
 	switch (type) {
 	case IPV6_RTHDR_TYPE_0:
@@ -61,9 +61,9 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 		dp0 = (const struct ip6_rthdr0 *)dp;
 
 		ND_TCHECK_4(dp0->ip6r0_reserved);
-		if (EXTRACT_BE_U_4(dp0->ip6r0_reserved) || ndo->ndo_vflag) {
+		if (GET_BE_U_4(dp0->ip6r0_reserved) || ndo->ndo_vflag) {
 			ND_PRINT(", rsv=0x%0x",
-			    EXTRACT_BE_U_4(dp0->ip6r0_reserved));
+			    GET_BE_U_4(dp0->ip6r0_reserved));
 		}
 
 		if (len % 2 == 1)
@@ -72,26 +72,26 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 		p = (const u_char *) dp0->ip6r0_addr;
 		for (i = 0; i < len; i++) {
 			ND_TCHECK_16(p);
-			ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, p));
+			ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
 			p += 16;
 		}
 		/*(*/
 		ND_PRINT(") ");
-		return((EXTRACT_U_1(dp0->ip6r0_len) + 1) << 3);
+		return((GET_U_1(dp0->ip6r0_len) + 1) << 3);
 		break;
 	case IPV6_RTHDR_TYPE_4:
 		srh = (const struct ip6_srh *)dp;
 		ND_TCHECK_1(srh->srh_last_ent);
-		ND_PRINT(", last-entry=%u", EXTRACT_U_1(srh->srh_last_ent));
+		ND_PRINT(", last-entry=%u", GET_U_1(srh->srh_last_ent));
 
 		ND_TCHECK_1(srh->srh_flags);
-		if (EXTRACT_U_1(srh->srh_flags) || ndo->ndo_vflag) {
+		if (GET_U_1(srh->srh_flags) || ndo->ndo_vflag) {
 			ND_PRINT(", flags=0x%0x",
-				EXTRACT_U_1(srh->srh_flags));
+				GET_U_1(srh->srh_flags));
 		}
 
 		ND_TCHECK_2(srh->srh_tag);
-		ND_PRINT(", tag=%x", EXTRACT_BE_U_2(srh->srh_tag));
+		ND_PRINT(", tag=%x", GET_BE_U_2(srh->srh_tag));
 
 		if (len % 2 == 1)
 			goto trunc;
@@ -99,12 +99,12 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 		p  = (const u_char *) srh->srh_segments;
 		for (i = 0; i < len; i++) {
 			ND_TCHECK_16(p);
-			ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, p));
+			ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
 			p += 16;
 		}
 		/*(*/
 		ND_PRINT(") ");
-		return((EXTRACT_U_1(srh->srh_len) + 1) << 3);
+		return((GET_U_1(srh->srh_len) + 1) << 3);
 		break;
 	default:
 		goto trunc;