X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/577621026df8d4a33a34d4e125f9ec964fc0e53c..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-dhcp6.c

diff --git a/print-dhcp6.c b/print-dhcp6.c
index cc2787a9..5558660a 100644
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -286,11 +286,15 @@ dhcp6opt_print(netdissect_options *ndo,
 	uint16_t opttype;
 	size_t optlen;
 	uint8_t auth_proto;
+	uint8_t auth_alg;
+	uint8_t auth_rdm;
 	u_int authinfolen, authrealmlen;
 	int remain_len;  /* Length of remaining options */
 	int label_len;   /* Label length */
 	uint16_t subopt_code;
 	uint16_t subopt_len;
+	uint8_t dh6_reconf_type;
+	uint8_t dh6_lq_query_type;
 
 	if (cp == ep)
 		return;
@@ -299,12 +303,12 @@ 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);
+		ND_TCHECK_LEN(cp + sizeof(*dh6o), optlen);
 		switch (opttype) {
 		case DH6OPT_CLIENTID:
 		case DH6OPT_SERVERID:
@@ -314,14 +318,14 @@ 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]));
+						ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
 					/*(*/
 					ND_PRINT((ndo, ")"));
 				} else {
@@ -333,7 +337,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				if (optlen >= 2 + 8) {
 					ND_PRINT((ndo, " vid "));
 					for (i = 2; i < 2 + 8; i++)
-						ND_PRINT((ndo, "%02x", tp[i]));
+						ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
 					/*(*/
 					ND_PRINT((ndo, ")"));
 				} else {
@@ -344,9 +348,9 @@ 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]));
+						ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
 					/*(*/
 					ND_PRINT((ndo, ")"));
 				} else {
@@ -355,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;
@@ -366,10 +370,10 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[0])));
+			ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp)));
 			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);
@@ -385,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;
@@ -395,7 +399,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %d)", *tp));
+			ND_PRINT((ndo, " %d)", EXTRACT_U_1(tp)));
 			break;
 		case DH6OPT_ELAPSED_TIME:
 			if (optlen != 2) {
@@ -403,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, " ("));
@@ -417,7 +421,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			auth_proto = *tp;
+			auth_proto = EXTRACT_U_1(tp);
 			switch (auth_proto) {
 			case DH6OPT_AUTHPROTO_DELAYED:
 				ND_PRINT((ndo, " proto: delayed"));
@@ -430,28 +434,30 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp++;
-			switch (*tp) {
+			auth_alg = EXTRACT_U_1(tp);
+			switch (auth_alg) {
 			case DH6OPT_AUTHALG_HMACMD5:
 				/* XXX: may depend on the protocol */
 				ND_PRINT((ndo, ", alg: HMAC-MD5"));
 				break;
 			default:
-				ND_PRINT((ndo, ", alg: %d", *tp));
+				ND_PRINT((ndo, ", alg: %d", auth_alg));
 				break;
 			}
 			tp++;
-			switch (*tp) {
+			auth_rdm = EXTRACT_U_1(tp);
+			switch (auth_rdm) {
 			case DH6OPT_AUTHRDM_MONOCOUNTER:
 				ND_PRINT((ndo, ", RDM: mono"));
 				break;
 			default:
-				ND_PRINT((ndo, ", RDM: %d", *tp));
+				ND_PRINT((ndo, ", RDM: %d", auth_rdm));
 				break;
 			}
 			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;
@@ -468,19 +474,19 @@ dhcp6opt_print(netdissect_options *ndo,
 					ND_PRINT((ndo, ", realm: "));
 				}
 				for (i = 0; i < authrealmlen; i++, tp++)
-					ND_PRINT((ndo, "%02x", *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 (*tp++) {
+				switch (EXTRACT_U_1(tp)) {
 				case DH6OPT_AUTHRECONFIG_KEY:
 					ND_PRINT((ndo, " reconfig-key"));
 					break;
@@ -491,9 +497,10 @@ dhcp6opt_print(netdissect_options *ndo,
 					ND_PRINT((ndo, " type: ??"));
 					break;
 				}
+				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, " ??"));
@@ -514,7 +521,7 @@ dhcp6opt_print(netdissect_options *ndo,
 			tp = (const u_char *)(dh6o + 1);
 			ND_PRINT((ndo, " "));
 			for (i = 0; i < optlen && i < 10; i++)
-				ND_PRINT((ndo, "%02x", tp[i]));
+				ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
 			ND_PRINT((ndo, "...)"));
 			break;
 		case DH6OPT_RECONF_MSG:
@@ -523,7 +530,8 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			switch (*tp) {
+			dh6_reconf_type = EXTRACT_U_1(tp);
+			switch (dh6_reconf_type) {
 			case DH6_RENEW:
 				ND_PRINT((ndo, " for renew)"));
 				break;
@@ -531,7 +539,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				ND_PRINT((ndo, " for inf-req)"));
 				break;
 			default:
-				ND_PRINT((ndo, " for ?\?\?(%02x))", *tp));
+				ND_PRINT((ndo, " for ?\?\?(%02x))", dh6_reconf_type));
 				break;
 			}
 			break;
@@ -552,7 +560,7 @@ dhcp6opt_print(netdissect_options *ndo,
 			}
 			tp = (const u_char *)(dh6o + 1);
 			for (i = 0; i < optlen; i += 16)
-				ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[i])));
+				ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp + i)));
 			ND_PRINT((ndo, ")"));
 			break;
 		case DH6OPT_SIP_SERVER_D:
@@ -571,7 +579,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %s)", dhcp6stcode(EXTRACT_BE_16BITS(&tp[0]))));
+			ND_PRINT((ndo, " %s)", dhcp6stcode(EXTRACT_BE_U_2(tp))));
 			break;
 		case DH6OPT_IA_NA:
 		case DH6OPT_IA_PD:
@@ -581,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[0]),
-			    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);
@@ -596,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);
@@ -609,10 +617,10 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %s/%d", ip6addr_string(ndo, &tp[9]), tp[8]));
+			ND_PRINT((ndo, " %s/%d", ip6addr_string(ndo, tp + 9), EXTRACT_U_1(tp + 8)));
 			ND_PRINT((ndo, " pltime:%u vltime:%u",
-			    EXTRACT_BE_32BITS(&tp[0]),
-			    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);
@@ -626,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) {
@@ -634,12 +642,12 @@ 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.
 			 */
 			for (i = 4; i < optlen && i < 14; i++)
-				ND_PRINT((ndo, "%02x", tp[i]));
+				ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
 			ND_PRINT((ndo, "...)"));
 			break;
 		case DH6OPT_LQ_QUERY:
@@ -648,7 +656,8 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			switch (*tp) {
+			dh6_lq_query_type = EXTRACT_U_1(tp);
+			switch (dh6_lq_query_type) {
 			case 1:
 				ND_PRINT((ndo, " by-address"));
 				break;
@@ -656,10 +665,10 @@ dhcp6opt_print(netdissect_options *ndo,
 				ND_PRINT((ndo, " by-clientID"));
 				break;
 			default:
-				ND_PRINT((ndo, " type_%d", (int)*tp));
+				ND_PRINT((ndo, " type_%u", dh6_lq_query_type));
 				break;
 			}
-			ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[1])));
+			ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp + 1)));
 			if (optlen > 17) {
 				/* there are query-options */
 				dhcp6opt_print(ndo, tp + 17, tp + optlen);
@@ -680,12 +689,12 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %s ", ip6addr_string(ndo, &tp[0])));
+			ND_PRINT((ndo, " %s ", ip6addr_string(ndo, tp)));
 			/*
 			 * Print hex dump first 10 characters.
 			 */
 			for (i = 16; i < optlen && i < 26; i++)
-				ND_PRINT((ndo, "%02x", tp[i]));
+				ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
 			ND_PRINT((ndo, "...)"));
 			break;
 		case DH6OPT_NTP_SERVER:
@@ -695,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;
@@ -709,7 +718,7 @@ dhcp6opt_print(netdissect_options *ndo,
 						ND_PRINT((ndo, " ?"));
 						break;
 					}
-					ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[0])));
+					ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp)));
 					break;
 				case DH6OPT_NTP_SUBOPTION_SRV_FQDN:
 					ND_PRINT((ndo, " "));
@@ -733,13 +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 && *tp) {
-				label_len =  *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(*tp) ND_PRINT((ndo, "."));
+					if(EXTRACT_U_1(tp)) ND_PRINT((ndo, "."));
 				} else {
 					ND_PRINT((ndo, " ?"));
 					break;
@@ -782,6 +792,7 @@ dhcp6_print(netdissect_options *ndo,
 {
 	const struct dhcp6 *dh6;
 	const struct dhcp6_relay *dh6relay;
+	uint8_t msgtype;
 	const u_char *ep;
 	const u_char *extp;
 	const char *name;
@@ -795,7 +806,8 @@ dhcp6_print(netdissect_options *ndo,
 	dh6 = (const struct dhcp6 *)cp;
 	dh6relay = (const struct dhcp6_relay *)cp;
 	ND_TCHECK(dh6->dh6_xid);
-	name = tok2str(dh6_msgtype_str, "msgtype-%u", dh6->dh6_msgtype);
+	msgtype = EXTRACT_U_1(dh6->dh6_msgtype);
+	name = tok2str(dh6_msgtype_str, "msgtype-%u", msgtype);
 
 	if (!ndo->ndo_vflag) {
 		ND_PRINT((ndo, " %s", name));
@@ -805,9 +817,8 @@ dhcp6_print(netdissect_options *ndo,
 	/* XXX relay agent messages have to be handled differently */
 
 	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));
+	if (msgtype != DH6_RELAY_FORW && msgtype != DH6_RELAY_REPLY) {
+		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 */