Rename EXTRACT_nBITS() macros to EXTRACT_BE_nBITS()

It indicates clearly that these macros are used to extract big-endian
integral values.

1 files changed, 48 insertions, 48 deletions

diff --git a/print-cnfp.c b/print-cnfp.c
index 7e7d835c..f58a8c2d 100644
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -168,8 +168,8 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
 	nh = (const struct nfhdr_v1 *)cp;
 	ND_TCHECK(*nh);
 
-	ver = EXTRACT_16BITS(&nh->version);
-	nrecs = EXTRACT_32BITS(&nh->count);
+	ver = EXTRACT_BE_16BITS(&nh->version);
+	nrecs = EXTRACT_BE_32BITS(&nh->count);
 #if 0
 	/*
 	 * This is seconds since the UN*X epoch, and is followed by
@@ -180,9 +180,9 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
 #endif
 
 	ND_PRINT((ndo, "NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
-	       EXTRACT_32BITS(&nh->msys_uptime)/1000,
-	       EXTRACT_32BITS(&nh->msys_uptime)%1000,
-	       EXTRACT_32BITS(&nh->utc_sec), EXTRACT_32BITS(&nh->utc_nsec)));
+	       EXTRACT_BE_32BITS(&nh->msys_uptime)/1000,
+	       EXTRACT_BE_32BITS(&nh->msys_uptime)%1000,
+	       EXTRACT_BE_32BITS(&nh->utc_sec), EXTRACT_BE_32BITS(&nh->utc_nsec)));
 
 	nr = (const struct nfrec_v1 *)&nh[1];
 
@@ -197,17 +197,17 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
 		 */
 		ND_TCHECK(*nr);
 		ND_PRINT((ndo, "\n  started %u.%03u, last %u.%03u",
-		       EXTRACT_32BITS(&nr->start_time)/1000,
-		       EXTRACT_32BITS(&nr->start_time)%1000,
-		       EXTRACT_32BITS(&nr->last_time)/1000,
-		       EXTRACT_32BITS(&nr->last_time)%1000));
+		       EXTRACT_BE_32BITS(&nr->start_time)/1000,
+		       EXTRACT_BE_32BITS(&nr->start_time)%1000,
+		       EXTRACT_BE_32BITS(&nr->last_time)/1000,
+		       EXTRACT_BE_32BITS(&nr->last_time)%1000));
 
 		asbuf[0] = buf[0] = '\0';
 		ND_PRINT((ndo, "\n    %s%s%s:%u ", intoa(nr->src_ina.s_addr), buf, asbuf,
-			EXTRACT_16BITS(&nr->srcport)));
+			EXTRACT_BE_16BITS(&nr->srcport)));
 
 		ND_PRINT((ndo, "> %s%s%s:%u ", intoa(nr->dst_ina.s_addr), buf, asbuf,
-			EXTRACT_16BITS(&nr->dstport)));
+			EXTRACT_BE_16BITS(&nr->dstport)));
 
 		ND_PRINT((ndo, ">> %s\n    ", intoa(nr->nhop_ina.s_addr)));
 
@@ -233,8 +233,8 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
 		buf[0]='\0';
 		ND_PRINT((ndo, "tos %u, %u (%u octets) %s",
 		       nr->tos,
-		       EXTRACT_32BITS(&nr->packets),
-		       EXTRACT_32BITS(&nr->octets), buf));
+		       EXTRACT_BE_32BITS(&nr->packets),
+		       EXTRACT_BE_32BITS(&nr->octets), buf));
 	}
 	return;
 
@@ -257,8 +257,8 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
 	nh = (const struct nfhdr_v5 *)cp;
 	ND_TCHECK(*nh);
 
-	ver = EXTRACT_16BITS(&nh->version);
-	nrecs = EXTRACT_32BITS(&nh->count);
+	ver = EXTRACT_BE_16BITS(&nh->version);
+	nrecs = EXTRACT_BE_32BITS(&nh->count);
 #if 0
 	/*
 	 * This is seconds since the UN*X epoch, and is followed by
@@ -269,11 +269,11 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
 #endif
 
 	ND_PRINT((ndo, "NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
-	       EXTRACT_32BITS(&nh->msys_uptime)/1000,
-	       EXTRACT_32BITS(&nh->msys_uptime)%1000,
-	       EXTRACT_32BITS(&nh->utc_sec), EXTRACT_32BITS(&nh->utc_nsec)));
+	       EXTRACT_BE_32BITS(&nh->msys_uptime)/1000,
+	       EXTRACT_BE_32BITS(&nh->msys_uptime)%1000,
+	       EXTRACT_BE_32BITS(&nh->utc_sec), EXTRACT_BE_32BITS(&nh->utc_nsec)));
 
-	ND_PRINT((ndo, "#%u, ", EXTRACT_32BITS(&nh->sequence)));
+	ND_PRINT((ndo, "#%u, ", EXTRACT_BE_32BITS(&nh->sequence)));
 	nr = (const struct nfrec_v5 *)&nh[1];
 
 	ND_PRINT((ndo, "%2u recs", nrecs));
@@ -287,23 +287,23 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
 		 */
 		ND_TCHECK(*nr);
 		ND_PRINT((ndo, "\n  started %u.%03u, last %u.%03u",
-		       EXTRACT_32BITS(&nr->start_time)/1000,
-		       EXTRACT_32BITS(&nr->start_time)%1000,
-		       EXTRACT_32BITS(&nr->last_time)/1000,
-		       EXTRACT_32BITS(&nr->last_time)%1000));
+		       EXTRACT_BE_32BITS(&nr->start_time)/1000,
+		       EXTRACT_BE_32BITS(&nr->start_time)%1000,
+		       EXTRACT_BE_32BITS(&nr->last_time)/1000,
+		       EXTRACT_BE_32BITS(&nr->last_time)%1000));
 
 		asbuf[0] = buf[0] = '\0';
 		snprintf(buf, sizeof(buf), "/%u", nr->src_mask);
 		snprintf(asbuf, sizeof(asbuf), ":%u",
-			EXTRACT_16BITS(&nr->src_as));
+			EXTRACT_BE_16BITS(&nr->src_as));
 		ND_PRINT((ndo, "\n    %s%s%s:%u ", intoa(nr->src_ina.s_addr), buf, asbuf,
-			EXTRACT_16BITS(&nr->srcport)));
+			EXTRACT_BE_16BITS(&nr->srcport)));
 
 		snprintf(buf, sizeof(buf), "/%d", nr->dst_mask);
 		snprintf(asbuf, sizeof(asbuf), ":%u",
-			 EXTRACT_16BITS(&nr->dst_as));
+			 EXTRACT_BE_16BITS(&nr->dst_as));
 		ND_PRINT((ndo, "> %s%s%s:%u ", intoa(nr->dst_ina.s_addr), buf, asbuf,
-			EXTRACT_16BITS(&nr->dstport)));
+			EXTRACT_BE_16BITS(&nr->dstport)));
 
 		ND_PRINT((ndo, ">> %s\n    ", intoa(nr->nhop_ina.s_addr)));
 
@@ -329,8 +329,8 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
 		buf[0]='\0';
 		ND_PRINT((ndo, "tos %u, %u (%u octets) %s",
 		       nr->tos,
-		       EXTRACT_32BITS(&nr->packets),
-		       EXTRACT_32BITS(&nr->octets), buf));
+		       EXTRACT_BE_32BITS(&nr->packets),
+		       EXTRACT_BE_32BITS(&nr->octets), buf));
 	}
 	return;
 
@@ -353,8 +353,8 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
 	nh = (const struct nfhdr_v6 *)cp;
 	ND_TCHECK(*nh);
 
-	ver = EXTRACT_16BITS(&nh->version);
-	nrecs = EXTRACT_32BITS(&nh->count);
+	ver = EXTRACT_BE_16BITS(&nh->version);
+	nrecs = EXTRACT_BE_32BITS(&nh->count);
 #if 0
 	/*
 	 * This is seconds since the UN*X epoch, and is followed by
@@ -365,11 +365,11 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
 #endif
 
 	ND_PRINT((ndo, "NetFlow v%x, %u.%03u uptime, %u.%09u, ", ver,
-	       EXTRACT_32BITS(&nh->msys_uptime)/1000,
-	       EXTRACT_32BITS(&nh->msys_uptime)%1000,
-	       EXTRACT_32BITS(&nh->utc_sec), EXTRACT_32BITS(&nh->utc_nsec)));
+	       EXTRACT_BE_32BITS(&nh->msys_uptime)/1000,
+	       EXTRACT_BE_32BITS(&nh->msys_uptime)%1000,
+	       EXTRACT_BE_32BITS(&nh->utc_sec), EXTRACT_BE_32BITS(&nh->utc_nsec)));
 
-	ND_PRINT((ndo, "#%u, ", EXTRACT_32BITS(&nh->sequence)));
+	ND_PRINT((ndo, "#%u, ", EXTRACT_BE_32BITS(&nh->sequence)));
 	nr = (const struct nfrec_v6 *)&nh[1];
 
 	ND_PRINT((ndo, "%2u recs", nrecs));
@@ -383,23 +383,23 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
 		 */
 		ND_TCHECK(*nr);
 		ND_PRINT((ndo, "\n  started %u.%03u, last %u.%03u",
-		       EXTRACT_32BITS(&nr->start_time)/1000,
-		       EXTRACT_32BITS(&nr->start_time)%1000,
-		       EXTRACT_32BITS(&nr->last_time)/1000,
-		       EXTRACT_32BITS(&nr->last_time)%1000));
+		       EXTRACT_BE_32BITS(&nr->start_time)/1000,
+		       EXTRACT_BE_32BITS(&nr->start_time)%1000,
+		       EXTRACT_BE_32BITS(&nr->last_time)/1000,
+		       EXTRACT_BE_32BITS(&nr->last_time)%1000));
 
 		asbuf[0] = buf[0] = '\0';
 		snprintf(buf, sizeof(buf), "/%u", nr->src_mask);
 		snprintf(asbuf, sizeof(asbuf), ":%u",
-			EXTRACT_16BITS(&nr->src_as));
+			EXTRACT_BE_16BITS(&nr->src_as));
 		ND_PRINT((ndo, "\n    %s%s%s:%u ", intoa(nr->src_ina.s_addr), buf, asbuf,
-			EXTRACT_16BITS(&nr->srcport)));
+			EXTRACT_BE_16BITS(&nr->srcport)));
 
 		snprintf(buf, sizeof(buf), "/%d", nr->dst_mask);
 		snprintf(asbuf, sizeof(asbuf), ":%u",
-			 EXTRACT_16BITS(&nr->dst_as));
+			 EXTRACT_BE_16BITS(&nr->dst_as));
 		ND_PRINT((ndo, "> %s%s%s:%u ", intoa(nr->dst_ina.s_addr), buf, asbuf,
-			EXTRACT_16BITS(&nr->dstport)));
+			EXTRACT_BE_16BITS(&nr->dstport)));
 
 		ND_PRINT((ndo, ">> %s\n    ", intoa(nr->nhop_ina.s_addr)));
 
@@ -424,12 +424,12 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
 
 		buf[0]='\0';
 		snprintf(buf, sizeof(buf), "(%u<>%u encaps)",
-			 (EXTRACT_16BITS(&nr->flags) >> 8) & 0xff,
-			 (EXTRACT_16BITS(&nr->flags)) & 0xff);
+			 (EXTRACT_BE_16BITS(&nr->flags) >> 8) & 0xff,
+			 (EXTRACT_BE_16BITS(&nr->flags)) & 0xff);
 		ND_PRINT((ndo, "tos %u, %u (%u octets) %s",
 		       nr->tos,
-		       EXTRACT_32BITS(&nr->packets),
-		       EXTRACT_32BITS(&nr->octets), buf));
+		       EXTRACT_BE_32BITS(&nr->packets),
+		       EXTRACT_BE_32BITS(&nr->octets), buf));
 	}
 	return;
 
@@ -447,7 +447,7 @@ cnfp_print(netdissect_options *ndo, const u_char *cp)
 	 * First 2 bytes are the version number.
 	 */
 	ND_TCHECK2(*cp, 2);
-	ver = EXTRACT_16BITS(cp);
+	ver = EXTRACT_BE_16BITS(cp);
 	switch (ver) {
 
 	case 1: