X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/da20bc56d6100b5275d6f85c4a25bac1dab4e57e..d7b497cac78b6e22a66a6bae9bdec60a8044f67a:/print-cdp.c

diff --git a/print-cdp.c b/print-cdp.c
index 1db0675d..908f55f4 100644
--- a/print-cdp.c
+++ b/print-cdp.c
@@ -106,7 +106,7 @@ cdp_print(netdissect_options *ndo,
 
 	ND_TCHECK2(*tptr, CDP_HEADER_LEN);
 	ND_PRINT((ndo, "CDPv%u, ttl: %us", EXTRACT_U_1((tptr + CDP_HEADER_VERSION_OFFSET)),
-					   *(tptr + CDP_HEADER_TTL_OFFSET)));
+					   EXTRACT_U_1(tptr + CDP_HEADER_TTL_OFFSET)));
 	if (ndo->ndo_vflag)
 		ND_PRINT((ndo, ", checksum: 0x%04x (unverified), length %u", EXTRACT_BE_U_2(tptr + CDP_HEADER_CHECKSUM_OFFSET), length));
 	tptr += CDP_HEADER_LEN;
@@ -202,7 +202,7 @@ cdp_print(netdissect_options *ndo,
 		    case 0x0b: /* Duplex - CDPv2 */
 			if (len < 1)
 			    goto trunc;
-			ND_PRINT((ndo, "%s", *(tptr) ? "full": "half"));
+			ND_PRINT((ndo, "%s", EXTRACT_U_1(tptr) ? "full": "half"));
 			break;
 
 		    /* http://www.cisco.com/c/en/us/td/docs/voice_ip_comm/cata/186/2_12_m/english/release/notes/186rn21m.html
@@ -224,12 +224,12 @@ cdp_print(netdissect_options *ndo,
 		    case 0x12: /* AVVID trust bitmap - not documented */
 			if (len < 1)
 			    goto trunc;
-			ND_PRINT((ndo, "0x%02x", *(tptr)));
+			ND_PRINT((ndo, "0x%02x", EXTRACT_U_1(tptr)));
 			break;
 		    case 0x13: /* AVVID untrusted port CoS - not documented */
 			if (len < 1)
 			    goto trunc;
-			ND_PRINT((ndo, "0x%02x", *(tptr)));
+			ND_PRINT((ndo, "0x%02x", EXTRACT_U_1(tptr)));
 			break;
 		    case 0x14: /* System Name - not documented */
 			ND_PRINT((ndo, "'"));
@@ -243,7 +243,7 @@ cdp_print(netdissect_options *ndo,
 		    case 0x17: /* Physical Location - not documented */
 			if (len < 1)
 			    goto trunc;
-			ND_PRINT((ndo, "0x%02x", *(tptr)));
+			ND_PRINT((ndo, "0x%02x", EXTRACT_U_1(tptr)));
 			if (len > 1) {
 				ND_PRINT((ndo, "/"));
 				(void)fn_printn(ndo, tptr + 1, len - 1, NULL);
@@ -285,21 +285,21 @@ cdp_print_addr(netdissect_options *ndo,
 		0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00, 0x86, 0xdd
 	};
 
-	ND_TCHECK2(*p, 4);
+	ND_TCHECK_4(p);
 	if (p + 4 > endp)
 		goto trunc;
 	num = EXTRACT_BE_U_4(p);
 	p += 4;
 
 	while (p < endp && num >= 0) {
-		ND_TCHECK2(*p, 2);
+		ND_TCHECK_2(p);
 		if (p + 2 > endp)
 			goto trunc;
 		pt = p[0];		/* type of "protocol" field */
 		pl = p[1];		/* length of "protocol" field */
 		p += 2;
 
-		ND_TCHECK2(p[pl], 2);
+		ND_TCHECK_2(p + pl);
 		if (p + pl + 2 > endp)
 			goto trunc;
 		al = EXTRACT_BE_U_2(p + pl);	/* address length */
@@ -312,7 +312,7 @@ cdp_print_addr(netdissect_options *ndo,
 			 */
 			p += 3;
 
-			ND_TCHECK2(*p, 4);
+			ND_TCHECK_4(p);
 			if (p + 4 > endp)
 				goto trunc;
 			ND_PRINT((ndo, "IPv4 (%u) %s", num, ipaddr_string(ndo, p)));
@@ -346,7 +346,7 @@ cdp_print_addr(netdissect_options *ndo,
 				ND_PRINT((ndo, " %02x", EXTRACT_U_1(p)));
 				p++;
 			}
-			ND_TCHECK2(*p, 2);
+			ND_TCHECK_2(p);
 			if (p + 2 > endp)
 				goto trunc;
 			ND_PRINT((ndo, ", al=%d, a=", al));
@@ -381,7 +381,9 @@ cdp_print_prefixes(netdissect_options *ndo,
 	ND_PRINT((ndo, " IPv4 Prefixes (%d):", l / 5));
 
 	while (l > 0) {
-		ND_PRINT((ndo, " %u.%u.%u.%u/%u", p[0], p[1], p[2], p[3], p[4]));
+		ND_PRINT((ndo, " %u.%u.%u.%u/%u",
+			  EXTRACT_U_1(p), EXTRACT_U_1(p + 1), EXTRACT_U_1(p + 2),
+			  EXTRACT_U_1(p + 3), EXTRACT_U_1(p + 4)));
 		l -= 5;
 		p += 5;
 	}