Rename EXTRACT_ macros

Now all the macros have a name meaning a count in bytes.

With _S_: signed, _U_: unsigned

e.g.:
EXTRACT_BE_32BITS -> EXTRACT_BE_U_4
EXTRACT_LE_32BITS -> EXTRACT_LE_U_4
...
EXTRACT_BE_INT32 -> EXTRACT_BE_S_4

and have:
EXTRACT_8BITS -> EXTRACT_U_1
EXTRACT_INT8  -> EXTRACT_S_1

1 files changed, 38 insertions, 38 deletions

diff --git a/print-dhcp6.c b/print-dhcp6.c
index 92ca980c..e2caa58a 100644
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -303,10 +303,10 @@ dhcp6opt_print(netdissect_options *ndo,
 			goto trunc;
 		dh6o = (const struct dhcp6opt *)cp;
 		ND_TCHECK(*dh6o);
-		optlen = EXTRACT_BE_16BITS(&dh6o->dh6opt_len);
+		optlen = EXTRACT_BE_U_2(&dh6o->dh6opt_len);
 		if (ep < cp + sizeof(*dh6o) + optlen)
 			goto trunc;
-		opttype = EXTRACT_BE_16BITS(&dh6o->dh6opt_type);
+		opttype = EXTRACT_BE_U_2(&dh6o->dh6opt_type);
 		ND_PRINT((ndo, " (%s", tok2str(dh6opt_str, "opt_%u", opttype)));
 		ND_TCHECK2(*(cp + sizeof(*dh6o)), optlen);
 		switch (opttype) {
@@ -318,12 +318,12 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			switch (EXTRACT_BE_16BITS(tp)) {
+			switch (EXTRACT_BE_U_2(tp)) {
 			case 1:
 				if (optlen >= 2 + 6) {
 					ND_PRINT((ndo, " hwaddr/time type %u time %u ",
-					    EXTRACT_BE_16BITS(tp + 2),
-					    EXTRACT_BE_32BITS(tp + 4)));
+					    EXTRACT_BE_U_2(tp + 2),
+					    EXTRACT_BE_U_4(tp + 4)));
 					for (i = 8; i < optlen; i++)
 						ND_PRINT((ndo, "%02x", tp[i]));
 					/*(*/
@@ -348,7 +348,7 @@ dhcp6opt_print(netdissect_options *ndo,
 			case 3:
 				if (optlen >= 2 + 2) {
 					ND_PRINT((ndo, " hwaddr type %u ",
-					    EXTRACT_BE_16BITS(tp + 2)));
+					    EXTRACT_BE_U_2(tp + 2)));
 					for (i = 4; i < optlen; i++)
 						ND_PRINT((ndo, "%02x", tp[i]));
 					/*(*/
@@ -359,7 +359,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				}
 				break;
 			default:
-				ND_PRINT((ndo, " type %d)", EXTRACT_BE_16BITS(tp)));
+				ND_PRINT((ndo, " type %d)", EXTRACT_BE_U_2(tp)));
 				break;
 			}
 			break;
@@ -372,8 +372,8 @@ dhcp6opt_print(netdissect_options *ndo,
 			tp = (const u_char *)(dh6o + 1);
 			ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[0])));
 			ND_PRINT((ndo, " pltime:%u vltime:%u",
-			    EXTRACT_BE_32BITS(tp + 16),
-			    EXTRACT_BE_32BITS(tp + 20)));
+			    EXTRACT_BE_U_4(tp + 16),
+			    EXTRACT_BE_U_4(tp + 20)));
 			if (optlen > 24) {
 				/* there are sub-options */
 				dhcp6opt_print(ndo, tp + 24, tp + optlen);
@@ -389,7 +389,7 @@ dhcp6opt_print(netdissect_options *ndo,
 			tp = (const u_char *)(dh6o + 1);
 			for (i = 0; i < optlen; i += 2) {
 				ND_PRINT((ndo, " %s",
-				    tok2str(dh6opt_str, "opt_%u", EXTRACT_BE_16BITS(tp + i))));
+				    tok2str(dh6opt_str, "opt_%u", EXTRACT_BE_U_2(tp + i))));
 			}
 			ND_PRINT((ndo, ")"));
 			break;
@@ -399,7 +399,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %d)", EXTRACT_8BITS(tp)));
+			ND_PRINT((ndo, " %d)", EXTRACT_U_1(tp)));
 			break;
 		case DH6OPT_ELAPSED_TIME:
 			if (optlen != 2) {
@@ -407,7 +407,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %d)", EXTRACT_BE_16BITS(tp)));
+			ND_PRINT((ndo, " %d)", EXTRACT_BE_U_2(tp)));
 			break;
 		case DH6OPT_RELAY_MSG:
 			ND_PRINT((ndo, " ("));
@@ -421,7 +421,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			auth_proto = EXTRACT_8BITS(tp);
+			auth_proto = EXTRACT_U_1(tp);
 			switch (auth_proto) {
 			case DH6OPT_AUTHPROTO_DELAYED:
 				ND_PRINT((ndo, " proto: delayed"));
@@ -434,7 +434,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp++;
-			auth_alg = EXTRACT_8BITS(tp);
+			auth_alg = EXTRACT_U_1(tp);
 			switch (auth_alg) {
 			case DH6OPT_AUTHALG_HMACMD5:
 				/* XXX: may depend on the protocol */
@@ -445,7 +445,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp++;
-			auth_rdm = EXTRACT_8BITS(tp);
+			auth_rdm = EXTRACT_U_1(tp);
 			switch (auth_rdm) {
 			case DH6OPT_AUTHRDM_MONOCOUNTER:
 				ND_PRINT((ndo, ", RDM: mono"));
@@ -457,7 +457,7 @@ dhcp6opt_print(netdissect_options *ndo,
 			tp++;
 			ND_PRINT((ndo, ", RD:"));
 			for (i = 0; i < 4; i++, tp += 2)
-				ND_PRINT((ndo, " %04x", EXTRACT_BE_16BITS(tp)));
+				ND_PRINT((ndo, " %04x", EXTRACT_BE_U_2(tp)));
 
 			/* protocol dependent part */
 			authinfolen = optlen - 11;
@@ -474,19 +474,19 @@ dhcp6opt_print(netdissect_options *ndo,
 					ND_PRINT((ndo, ", realm: "));
 				}
 				for (i = 0; i < authrealmlen; i++, tp++)
-					ND_PRINT((ndo, "%02x", EXTRACT_8BITS(tp)));
-				ND_PRINT((ndo, ", key ID: %08x", EXTRACT_BE_32BITS(tp)));
+					ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp)));
+				ND_PRINT((ndo, ", key ID: %08x", EXTRACT_BE_U_4(tp)));
 				tp += 4;
 				ND_PRINT((ndo, ", HMAC-MD5:"));
 				for (i = 0; i < 4; i++, tp+= 4)
-					ND_PRINT((ndo, " %08x", EXTRACT_BE_32BITS(tp)));
+					ND_PRINT((ndo, " %08x", EXTRACT_BE_U_4(tp)));
 				break;
 			case DH6OPT_AUTHPROTO_RECONFIG:
 				if (authinfolen != 17) {
 					ND_PRINT((ndo, " ??"));
 					break;
 				}
-				switch (EXTRACT_8BITS(tp)) {
+				switch (EXTRACT_U_1(tp)) {
 				case DH6OPT_AUTHRECONFIG_KEY:
 					ND_PRINT((ndo, " reconfig-key"));
 					break;
@@ -500,7 +500,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				tp++;
 				ND_PRINT((ndo, " value:"));
 				for (i = 0; i < 4; i++, tp+= 4)
-					ND_PRINT((ndo, " %08x", EXTRACT_BE_32BITS(tp)));
+					ND_PRINT((ndo, " %08x", EXTRACT_BE_U_4(tp)));
 				break;
 			default:
 				ND_PRINT((ndo, " ??"));
@@ -530,7 +530,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			dh6_reconf_type = EXTRACT_8BITS(tp);
+			dh6_reconf_type = EXTRACT_U_1(tp);
 			switch (dh6_reconf_type) {
 			case DH6_RENEW:
 				ND_PRINT((ndo, " for renew)"));
@@ -579,7 +579,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %s)", dhcp6stcode(EXTRACT_BE_16BITS(tp))));
+			ND_PRINT((ndo, " %s)", dhcp6stcode(EXTRACT_BE_U_2(tp))));
 			break;
 		case DH6OPT_IA_NA:
 		case DH6OPT_IA_PD:
@@ -589,9 +589,9 @@ dhcp6opt_print(netdissect_options *ndo,
 			}
 			tp = (const u_char *)(dh6o + 1);
 			ND_PRINT((ndo, " IAID:%u T1:%u T2:%u",
-			    EXTRACT_BE_32BITS(tp),
-			    EXTRACT_BE_32BITS(tp + 4),
-			    EXTRACT_BE_32BITS(tp + 8)));
+			    EXTRACT_BE_U_4(tp),
+			    EXTRACT_BE_U_4(tp + 4),
+			    EXTRACT_BE_U_4(tp + 8)));
 			if (optlen > 12) {
 				/* there are sub-options */
 				dhcp6opt_print(ndo, tp + 12, tp + optlen);
@@ -604,7 +604,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " IAID:%u", EXTRACT_BE_32BITS(tp)));
+			ND_PRINT((ndo, " IAID:%u", EXTRACT_BE_U_4(tp)));
 			if (optlen > 4) {
 				/* there are sub-options */
 				dhcp6opt_print(ndo, tp + 4, tp + optlen);
@@ -619,8 +619,8 @@ dhcp6opt_print(netdissect_options *ndo,
 			tp = (const u_char *)(dh6o + 1);
 			ND_PRINT((ndo, " %s/%d", ip6addr_string(ndo, &tp[9]), tp[8]));
 			ND_PRINT((ndo, " pltime:%u vltime:%u",
-			    EXTRACT_BE_32BITS(tp),
-			    EXTRACT_BE_32BITS(tp + 4)));
+			    EXTRACT_BE_U_4(tp),
+			    EXTRACT_BE_U_4(tp + 4)));
 			if (optlen > 25) {
 				/* there are sub-options */
 				dhcp6opt_print(ndo, tp + 25, tp + optlen);
@@ -634,7 +634,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %d)", EXTRACT_BE_32BITS(tp)));
+			ND_PRINT((ndo, " %d)", EXTRACT_BE_U_4(tp)));
 			break;
 		case DH6OPT_REMOTE_ID:
 			if (optlen < 4) {
@@ -642,7 +642,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %d ", EXTRACT_BE_32BITS(tp)));
+			ND_PRINT((ndo, " %d ", EXTRACT_BE_U_4(tp)));
 			/*
 			 * Print hex dump first 10 characters.
 			 */
@@ -656,7 +656,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			dh6_lq_query_type = EXTRACT_8BITS(tp);
+			dh6_lq_query_type = EXTRACT_U_1(tp);
 			switch (dh6_lq_query_type) {
 			case 1:
 				ND_PRINT((ndo, " by-address"));
@@ -704,9 +704,9 @@ dhcp6opt_print(netdissect_options *ndo,
 			}
 			tp = (const u_char *)(dh6o + 1);
 			while (tp < cp + sizeof(*dh6o) + optlen - 4) {
-				subopt_code = EXTRACT_BE_16BITS(tp);
+				subopt_code = EXTRACT_BE_U_2(tp);
 				tp += 2;
-				subopt_len = EXTRACT_BE_16BITS(tp);
+				subopt_len = EXTRACT_BE_U_2(tp);
 				tp += 2;
 				if (tp + subopt_len > cp + sizeof(*dh6o) + optlen)
 					goto trunc;
@@ -742,14 +742,14 @@ dhcp6opt_print(netdissect_options *ndo,
 			remain_len = optlen;
 			ND_PRINT((ndo, " "));
 			/* Encoding is described in section 3.1 of RFC 1035 */
-			while (remain_len && EXTRACT_8BITS(tp)) {
-				label_len = EXTRACT_8BITS(tp);
+			while (remain_len && EXTRACT_U_1(tp)) {
+				label_len = EXTRACT_U_1(tp);
 				tp++;
 				if (label_len < remain_len - 1) {
 					(void)fn_printn(ndo, tp, label_len, NULL);
 					tp += label_len;
 					remain_len -= (label_len + 1);
-					if(EXTRACT_8BITS(tp)) ND_PRINT((ndo, "."));
+					if(EXTRACT_U_1(tp)) ND_PRINT((ndo, "."));
 				} else {
 					ND_PRINT((ndo, " ?"));
 					break;
@@ -817,7 +817,7 @@ dhcp6_print(netdissect_options *ndo,
 	ND_PRINT((ndo, " %s (", name));	/*)*/
 	if (dh6->dh6_msgtype != DH6_RELAY_FORW &&
 	    dh6->dh6_msgtype != DH6_RELAY_REPLY) {
-		ND_PRINT((ndo, "xid=%x", EXTRACT_BE_32BITS(&dh6->dh6_xid) & DH6_XIDMASK));
+		ND_PRINT((ndo, "xid=%x", EXTRACT_BE_U_4(&dh6->dh6_xid) & DH6_XIDMASK));
 		extp = (const u_char *)(dh6 + 1);
 		dhcp6opt_print(ndo, extp, ep);
 	} else {		/* relay messages */