Use the new GET_ macros instead of the EXTRACT_ ones

The exceptions are currently:
Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer.
An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer
pointer.

1 files changed, 16 insertions, 16 deletions

diff --git a/print-gre.c b/print-gre.c
index f363f8b1..773c030c 100644
--- a/print-gre.c
+++ b/print-gre.c
@@ -87,7 +87,7 @@ gre_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	ND_TCHECK_2(bp);
 	if (len < 2)
 		goto trunc;
-	vers = EXTRACT_BE_U_2(bp) & GRE_VERS_MASK;
+	vers = GET_BE_U_2(bp) & GRE_VERS_MASK;
 	ND_PRINT("GREv%u",vers);
 
 	switch(vers) {
@@ -115,7 +115,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
 	uint16_t flags, prot;
 
 	/* 16 bits ND_TCHECKed in gre_print() */
-	flags = EXTRACT_BE_U_2(bp);
+	flags = GET_BE_U_2(bp);
 	if (ndo->ndo_vflag)
 		ND_PRINT(", Flags [%s]",
 			 bittok2str(gre_flag_values,"none",flags));
@@ -126,7 +126,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
 	ND_TCHECK_2(bp);
 	if (len < 2)
 		goto trunc;
-	prot = EXTRACT_BE_U_2(bp);
+	prot = GET_BE_U_2(bp);
 	len -= 2;
 	bp += 2;
 
@@ -135,14 +135,14 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
 		if (len < 2)
 			goto trunc;
 		if (ndo->ndo_vflag)
-			ND_PRINT(", sum 0x%x", EXTRACT_BE_U_2(bp));
+			ND_PRINT(", sum 0x%x", GET_BE_U_2(bp));
 		bp += 2;
 		len -= 2;
 
 		ND_TCHECK_2(bp);
 		if (len < 2)
 			goto trunc;
-		ND_PRINT(", off 0x%x", EXTRACT_BE_U_2(bp));
+		ND_PRINT(", off 0x%x", GET_BE_U_2(bp));
 		bp += 2;
 		len -= 2;
 	}
@@ -151,7 +151,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
 		ND_TCHECK_4(bp);
 		if (len < 4)
 			goto trunc;
-		ND_PRINT(", key=0x%x", EXTRACT_BE_U_4(bp));
+		ND_PRINT(", key=0x%x", GET_BE_U_4(bp));
 		bp += 4;
 		len -= 4;
 	}
@@ -160,7 +160,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
 		ND_TCHECK_4(bp);
 		if (len < 4)
 			goto trunc;
-		ND_PRINT(", seq %u", EXTRACT_BE_U_4(bp));
+		ND_PRINT(", seq %u", GET_BE_U_4(bp));
 		bp += 4;
 		len -= 4;
 	}
@@ -174,9 +174,9 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
 			ND_TCHECK_4(bp);
 			if (len < 4)
 				goto trunc;
-			af = EXTRACT_BE_U_2(bp);
-			sreoff = EXTRACT_U_1(bp + 2);
-			srelen = EXTRACT_U_1(bp + 3);
+			af = GET_BE_U_2(bp);
+			sreoff = GET_U_1(bp + 2);
+			srelen = GET_U_1(bp + 3);
 			bp += 4;
 			len -= 4;
 
@@ -242,7 +242,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
 	uint16_t flags, prot;
 
 	/* 16 bits ND_TCHECKed in gre_print() */
-	flags = EXTRACT_BE_U_2(bp);
+	flags = GET_BE_U_2(bp);
 	len -= 2;
 	bp += 2;
 
@@ -253,7 +253,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
 	ND_TCHECK_2(bp);
 	if (len < 2)
 		goto trunc;
-	prot = EXTRACT_BE_U_2(bp);
+	prot = GET_BE_U_2(bp);
 	len -= 2;
 	bp += 2;
 
@@ -264,7 +264,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
 		ND_TCHECK_4(bp);
 		if (len < 4)
 			goto trunc;
-		k = EXTRACT_BE_U_4(bp);
+		k = GET_BE_U_4(bp);
 		ND_PRINT(", call %u", k & 0xffff);
 		len -= 4;
 		bp += 4;
@@ -274,7 +274,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
 		ND_TCHECK_4(bp);
 		if (len < 4)
 			goto trunc;
-		ND_PRINT(", seq %u", EXTRACT_BE_U_4(bp));
+		ND_PRINT(", seq %u", GET_BE_U_4(bp));
 		bp += 4;
 		len -= 4;
 	}
@@ -283,7 +283,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
 		ND_TCHECK_4(bp);
 		if (len < 4)
 			goto trunc;
-		ND_PRINT(", ack %u", EXTRACT_BE_U_4(bp));
+		ND_PRINT(", ack %u", GET_BE_U_4(bp));
 		bp += 4;
 		len -= 4;
 	}
@@ -406,7 +406,7 @@ gre_sre_asn_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
 			return (0);
 
 		ND_PRINT(" %s%x",
-			 ((bp - up) == sreoff) ? "*" : "", EXTRACT_BE_U_2(bp));
+			 ((bp - up) == sreoff) ? "*" : "", GET_BE_U_2(bp));
 
 		bp += 2;
 		len -= 2;