X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/a9c8816ff092f73c15a9f16ba665e158da99a1a0..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/print-gre.c

diff --git a/print-gre.c b/print-gre.c
index f363f8b1..b1a81429 100644
--- a/print-gre.c
+++ b/print-gre.c
@@ -39,8 +39,6 @@
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
 #include "netdissect.h"
 #include "addrtostr.h"
 #include "extract.h"
@@ -52,7 +50,6 @@
 #define	GRE_KP		0x2000		/* key present */
 #define	GRE_SP		0x1000		/* sequence# present */
 #define	GRE_sP		0x0800		/* source routing */
-#define	GRE_RECRS	0x0700		/* recursion count */
 #define	GRE_AP		0x0080		/* acknowledgment# present */
 
 static const struct tok gre_flag_values[] = {
@@ -61,11 +58,11 @@ static const struct tok gre_flag_values[] = {
     { GRE_KP, "key present"},
     { GRE_SP, "sequence# present"},
     { GRE_sP, "source routing present"},
-    { GRE_RECRS, "recursion count"},
     { GRE_AP, "ack present"},
     { 0, NULL }
 };
 
+#define	GRE_RECRS_MASK	0x0700		/* recursion count */
 #define	GRE_VERS_MASK	0x0007		/* protocol version */
 
 /* source route entry types */
@@ -87,7 +84,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) {
@@ -105,7 +102,6 @@ gre_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
 trunc:
 	nd_print_trunc(ndo);
-	return;
 }
 
 static void
@@ -115,7 +111,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 +122,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 +131,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 +147,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 +156,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 +170,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;
 
@@ -224,7 +220,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
 		isoclns_print(ndo, bp, len);
 		break;
 	case ETHERTYPE_TEB:
-		ether_print(ndo, bp, len, ndo->ndo_snapend - bp, NULL, NULL);
+		ether_print(ndo, bp, len, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL);
 		break;
 	default:
 		ND_PRINT("gre-proto-0x%x", prot);
@@ -242,7 +238,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 +249,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 +260,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 +270,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 +279,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 +402,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;