X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f411a05060610bd0a047cbae3f2a01db5628fa6c..d7b497cac78b6e22a66a6bae9bdec60a8044f67a:/print-domain.c

diff --git a/print-domain.c b/print-domain.c
index 1968608b..e150116d 100644
--- a/print-domain.c
+++ b/print-domain.c
@@ -56,9 +56,9 @@ ns_nskip(netdissect_options *ndo,
 {
 	register u_char i;
 
-	if (!ND_TTEST_8BITS(cp))
+	if (!ND_TTEST_1(cp))
 		return (NULL);
-	i = EXTRACT_8BITS(cp);
+	i = EXTRACT_U_1(cp);
 	cp++;
 	while (i) {
 		if ((i & INDIR_MASK) == INDIR_MASK)
@@ -68,18 +68,18 @@ ns_nskip(netdissect_options *ndo,
 
 			if ((i & ~INDIR_MASK) != EDNS0_ELT_BITLABEL)
 				return(NULL); /* unknown ELT */
-			if (!ND_TTEST_8BITS(cp))
+			if (!ND_TTEST_1(cp))
 				return (NULL);
-			if ((bitlen = EXTRACT_8BITS(cp)) == 0)
+			if ((bitlen = EXTRACT_U_1(cp)) == 0)
 				bitlen = 256;
 			cp++;
 			bytelen = (bitlen + 7) / 8;
 			cp += bytelen;
 		} else
 			cp += i;
-		if (!ND_TTEST_8BITS(cp))
+		if (!ND_TTEST_1(cp))
 			return (NULL);
-		i = EXTRACT_8BITS(cp);
+		i = EXTRACT_U_1(cp);
 		cp++;
 	}
 	return (cp);
@@ -94,9 +94,9 @@ blabel_print(netdissect_options *ndo,
 	const u_char *bitp, *lim;
 	char tc;
 
-	if (!ND_TTEST_8BITS(cp))
+	if (!ND_TTEST_1(cp))
 		return(NULL);
-	if ((bitlen = EXTRACT_8BITS(cp)) == 0)
+	if ((bitlen = EXTRACT_U_1(cp)) == 0)
 		bitlen = 256;
 	slen = (bitlen + 3) / 4;
 	lim = cp + 1 + slen;
@@ -105,16 +105,16 @@ blabel_print(netdissect_options *ndo,
 	ND_PRINT((ndo, "\\[x"));
 	for (bitp = cp + 1, b = bitlen; bitp < lim && b > 7; b -= 8, bitp++) {
 		ND_TCHECK(*bitp);
-		ND_PRINT((ndo, "%02x", *bitp));
+		ND_PRINT((ndo, "%02x", EXTRACT_U_1(bitp)));
 	}
 	if (b > 4) {
 		ND_TCHECK(*bitp);
-		tc = EXTRACT_8BITS(bitp);
+		tc = EXTRACT_U_1(bitp);
 		bitp++;
 		ND_PRINT((ndo, "%02x", tc & (0xff << (8 - b))));
 	} else if (b > 0) {
 		ND_TCHECK(*bitp);
-		tc = EXTRACT_8BITS(bitp);
+		tc = EXTRACT_U_1(bitp);
 		bitp++;
 		ND_PRINT((ndo, "%1x", ((tc >> 4) & 0x0f) & (0x0f << (4 - b))));
 	}
@@ -131,18 +131,18 @@ labellen(netdissect_options *ndo,
 {
 	register u_int i;
 
-	if (!ND_TTEST_8BITS(cp))
+	if (!ND_TTEST_1(cp))
 		return(-1);
-	i = EXTRACT_8BITS(cp);
+	i = EXTRACT_U_1(cp);
 	if ((i & INDIR_MASK) == EDNS0_MASK) {
 		int bitlen, elt;
 		if ((elt = (i & ~INDIR_MASK)) != EDNS0_ELT_BITLABEL) {
 			ND_PRINT((ndo, "<ELT %d>", elt));
 			return(-1);
 		}
-		if (!ND_TTEST_8BITS(cp + 1))
+		if (!ND_TTEST_1(cp + 1))
 			return(-1);
-		if ((bitlen = EXTRACT_8BITS(cp + 1)) == 0)
+		if ((bitlen = EXTRACT_U_1(cp + 1)) == 0)
 			bitlen = 256;
 		return(((bitlen + 7) / 8) + 1);
 	} else
@@ -161,10 +161,10 @@ ns_nprint(netdissect_options *ndo,
 
 	if ((l = labellen(ndo, cp)) == (u_int)-1)
 		return(NULL);
-	if (!ND_TTEST_8BITS(cp))
+	if (!ND_TTEST_1(cp))
 		return(NULL);
 	max_offset = (u_int)(cp - bp);
-	i = EXTRACT_8BITS(cp);
+	i = EXTRACT_U_1(cp);
 	cp++;
 	if ((i & INDIR_MASK) != INDIR_MASK) {
 		compress = 0;
@@ -178,9 +178,9 @@ ns_nprint(netdissect_options *ndo,
 					rp = cp + 1;
 					compress = 1;
 				}
-				if (!ND_TTEST_8BITS(cp))
+				if (!ND_TTEST_1(cp))
 					return(NULL);
-				offset = (((i << 8) | EXTRACT_8BITS(cp)) & 0x3fff);
+				offset = (((i << 8) | EXTRACT_U_1(cp)) & 0x3fff);
 				/*
 				 * This must move backwards in the packet.
 				 * No RFC explicitly says that, but BIND's
@@ -199,9 +199,9 @@ ns_nprint(netdissect_options *ndo,
 				cp = bp + offset;
 				if ((l = labellen(ndo, cp)) == (u_int)-1)
 					return(NULL);
-				if (!ND_TTEST_8BITS(cp))
+				if (!ND_TTEST_1(cp))
 					return(NULL);
-				i = EXTRACT_8BITS(cp);
+				i = EXTRACT_U_1(cp);
 				cp++;
 				continue;
 			}
@@ -226,9 +226,9 @@ ns_nprint(netdissect_options *ndo,
 			ND_PRINT((ndo, "."));
 			if ((l = labellen(ndo, cp)) == (u_int)-1)
 				return(NULL);
-			if (!ND_TTEST_8BITS(cp))
+			if (!ND_TTEST_1(cp))
 				return(NULL);
-			i = EXTRACT_8BITS(cp);
+			i = EXTRACT_U_1(cp);
 			cp++;
 			if (!compress)
 				rp += l + 1;
@@ -245,9 +245,9 @@ ns_cprint(netdissect_options *ndo,
 {
 	register u_int i;
 
-	if (!ND_TTEST_8BITS(cp))
+	if (!ND_TTEST_1(cp))
 		return (NULL);
-	i = EXTRACT_8BITS(cp);
+	i = EXTRACT_U_1(cp);
 	cp++;
 	if (fn_printn(ndo, cp, i, ndo->ndo_snapend))
 		return (NULL);
@@ -338,15 +338,15 @@ ns_qprint(netdissect_options *ndo,
 
 	cp = ns_nskip(ndo, cp);
 
-	if (cp == NULL || !ND_TTEST2(*cp, 4))
+	if (cp == NULL || !ND_TTEST_4(cp))
 		return(NULL);
 
 	/* print the qtype */
-	i = EXTRACT_BE_16BITS(cp);
+	i = EXTRACT_BE_U_2(cp);
 	cp += 2;
 	ND_PRINT((ndo, " %s", tok2str(ns_type2str, "Type%d", i)));
 	/* print the qclass (if it's not IN) */
-	i = EXTRACT_BE_16BITS(cp);
+	i = EXTRACT_BE_U_2(cp);
 	cp += 2;
 	if (is_mdns)
 		class = (i & ~C_QU);
@@ -383,10 +383,10 @@ ns_rprint(netdissect_options *ndo,
 		return (ndo->ndo_snapend);
 
 	/* print the type/qtype */
-	typ = EXTRACT_BE_16BITS(cp);
+	typ = EXTRACT_BE_U_2(cp);
 	cp += 2;
 	/* print the class (if it's not IN and the type isn't OPT) */
-	i = EXTRACT_BE_16BITS(cp);
+	i = EXTRACT_BE_U_2(cp);
 	cp += 2;
 	if (is_mdns)
 		class = (i & ~C_CACHE_FLUSH);
@@ -402,13 +402,13 @@ ns_rprint(netdissect_options *ndo,
 	if (typ == T_OPT) {
 		/* get opt flags */
 		cp += 2;
-		opt_flags = EXTRACT_BE_16BITS(cp);
+		opt_flags = EXTRACT_BE_U_2(cp);
 		/* ignore rest of ttl field */
 		cp += 2;
 	} else if (ndo->ndo_vflag > 2) {
 		/* print ttl */
 		ND_PRINT((ndo, " ["));
-		unsigned_relts_print(ndo, EXTRACT_BE_32BITS(cp));
+		unsigned_relts_print(ndo, EXTRACT_BE_U_4(cp));
 		ND_PRINT((ndo, "]"));
 		cp += 4;
 	} else {
@@ -416,7 +416,7 @@ ns_rprint(netdissect_options *ndo,
 		cp += 4;
 	}
 
-	len = EXTRACT_BE_16BITS(cp);
+	len = EXTRACT_BE_U_2(cp);
 	cp += 2;
 
 	rp = cp + len;
@@ -429,7 +429,7 @@ ns_rprint(netdissect_options *ndo,
 	case T_A:
 		if (!ND_TTEST2(*cp, sizeof(struct in_addr)))
 			return(NULL);
-		ND_PRINT((ndo, " %s", intoa(htonl(EXTRACT_BE_32BITS(cp)))));
+		ND_PRINT((ndo, " %s", intoa(htonl(EXTRACT_BE_U_4(cp)))));
 		break;
 
 	case T_NS:
@@ -454,24 +454,24 @@ ns_rprint(netdissect_options *ndo,
 			return(NULL);
 		if (!ND_TTEST2(*cp, 5 * 4))
 			return(NULL);
-		ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(cp)));
+		ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));
 		cp += 4;
-		ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(cp)));
+		ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));
 		cp += 4;
-		ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(cp)));
+		ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));
 		cp += 4;
-		ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(cp)));
+		ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));
 		cp += 4;
-		ND_PRINT((ndo, " %u", EXTRACT_BE_32BITS(cp)));
+		ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(cp)));
 		cp += 4;
 		break;
 	case T_MX:
 		ND_PRINT((ndo, " "));
-		if (!ND_TTEST2(*cp, 2))
+		if (!ND_TTEST_2(cp))
 			return(NULL);
 		if (ns_nprint(ndo, cp + 2, bp) == NULL)
 			return(NULL);
-		ND_PRINT((ndo, " %d", EXTRACT_BE_16BITS(cp)));
+		ND_PRINT((ndo, " %d", EXTRACT_BE_U_2(cp)));
 		break;
 
 	case T_TXT:
@@ -486,12 +486,12 @@ ns_rprint(netdissect_options *ndo,
 
 	case T_SRV:
 		ND_PRINT((ndo, " "));
-		if (!ND_TTEST2(*cp, 6))
+		if (!ND_TTEST_6(cp))
 			return(NULL);
 		if (ns_nprint(ndo, cp + 6, bp) == NULL)
 			return(NULL);
-		ND_PRINT((ndo, ":%d %d %d", EXTRACT_BE_16BITS(cp + 4),
-			  EXTRACT_BE_16BITS(cp), EXTRACT_BE_16BITS(cp + 2)));
+		ND_PRINT((ndo, ":%d %d %d", EXTRACT_BE_U_2(cp + 4),
+			  EXTRACT_BE_U_2(cp), EXTRACT_BE_U_2(cp + 2)));
 		break;
 
 	case T_AAAA:
@@ -512,9 +512,9 @@ ns_rprint(netdissect_options *ndo,
 		int pbit, pbyte;
 		char ntop_buf[INET6_ADDRSTRLEN];
 
-		if (!ND_TTEST_8BITS(cp))
+		if (!ND_TTEST_1(cp))
 			return(NULL);
-		pbit = EXTRACT_8BITS(cp);
+		pbit = EXTRACT_U_1(cp);
 		pbyte = (pbit & ~7) / 8;
 		if (pbit > 128) {
 			ND_PRINT((ndo, " %u(bad plen)", pbit));
@@ -558,25 +558,25 @@ ns_rprint(netdissect_options *ndo,
 		if ((cp = ns_nprint(ndo, cp, bp)) == NULL)
 			return(NULL);
 		cp += 6;
-		if (!ND_TTEST_16BITS(cp))
+		if (!ND_TTEST_2(cp))
 			return(NULL);
-		ND_PRINT((ndo, " fudge=%u", EXTRACT_BE_16BITS(cp)));
+		ND_PRINT((ndo, " fudge=%u", EXTRACT_BE_U_2(cp)));
 		cp += 2;
-		if (!ND_TTEST_16BITS(cp))
+		if (!ND_TTEST_2(cp))
 			return(NULL);
-		ND_PRINT((ndo, " maclen=%u", EXTRACT_BE_16BITS(cp)));
-		cp += 2 + EXTRACT_BE_16BITS(cp);
-		if (!ND_TTEST_16BITS(cp))
+		ND_PRINT((ndo, " maclen=%u", EXTRACT_BE_U_2(cp)));
+		cp += 2 + EXTRACT_BE_U_2(cp);
+		if (!ND_TTEST_2(cp))
 			return(NULL);
-		ND_PRINT((ndo, " origid=%u", EXTRACT_BE_16BITS(cp)));
+		ND_PRINT((ndo, " origid=%u", EXTRACT_BE_U_2(cp)));
 		cp += 2;
-		if (!ND_TTEST_16BITS(cp))
+		if (!ND_TTEST_2(cp))
 			return(NULL);
-		ND_PRINT((ndo, " error=%u", EXTRACT_BE_16BITS(cp)));
+		ND_PRINT((ndo, " error=%u", EXTRACT_BE_U_2(cp)));
 		cp += 2;
-		if (!ND_TTEST_16BITS(cp))
+		if (!ND_TTEST_2(cp))
 			return(NULL);
-		ND_PRINT((ndo, " otherlen=%u", EXTRACT_BE_16BITS(cp)));
+		ND_PRINT((ndo, " otherlen=%u", EXTRACT_BE_U_2(cp)));
 		cp += 2;
 	    }
 	}
@@ -595,15 +595,15 @@ domain_print(netdissect_options *ndo,
 	np = (const HEADER *)bp;
 	ND_TCHECK(*np);
 	/* get the byte-order right */
-	qdcount = EXTRACT_BE_16BITS(&np->qdcount);
-	ancount = EXTRACT_BE_16BITS(&np->ancount);
-	nscount = EXTRACT_BE_16BITS(&np->nscount);
-	arcount = EXTRACT_BE_16BITS(&np->arcount);
+	qdcount = EXTRACT_BE_U_2(&np->qdcount);
+	ancount = EXTRACT_BE_U_2(&np->ancount);
+	nscount = EXTRACT_BE_U_2(&np->nscount);
+	arcount = EXTRACT_BE_U_2(&np->arcount);
 
 	if (DNS_QR(np)) {
 		/* this is a response */
 		ND_PRINT((ndo, "%d%s%s%s%s%s%s",
-			EXTRACT_BE_16BITS(&np->id),
+			EXTRACT_BE_U_2(&np->id),
 			ns_ops[DNS_OPCODE(np)],
 			ns_resp[DNS_RCODE(np)],
 			DNS_AA(np)? "*" : "",
@@ -616,7 +616,7 @@ domain_print(netdissect_options *ndo,
 		/* Print QUESTION section on -vv */
 		cp = (const u_char *)(np + 1);
 		while (qdcount--) {
-			if (qdcount < EXTRACT_BE_16BITS(&np->qdcount) - 1)
+			if (qdcount < EXTRACT_BE_U_2(&np->qdcount) - 1)
 				ND_PRINT((ndo, ","));
 			if (ndo->ndo_vflag > 1) {
 				ND_PRINT((ndo, " q:"));
@@ -670,12 +670,12 @@ domain_print(netdissect_options *ndo,
 	}
 	else {
 		/* this is a request */
-		ND_PRINT((ndo, "%d%s%s%s", EXTRACT_BE_16BITS(&np->id), ns_ops[DNS_OPCODE(np)],
+		ND_PRINT((ndo, "%d%s%s%s", EXTRACT_BE_U_2(&np->id), ns_ops[DNS_OPCODE(np)],
 			  DNS_RD(np) ? "+" : "",
 			  DNS_CD(np) ? "%" : ""));
 
 		/* any weirdness? */
-		b2 = EXTRACT_BE_16BITS(((const u_short *)np) + 1);
+		b2 = EXTRACT_BE_U_2(((const u_short *)np) + 1);
 		if (b2 & 0x6cf)
 			ND_PRINT((ndo, " [b2&3=0x%x]", b2));