X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ba8936b39b0ce2ff02f3aeb307df4c27657652d8..2de3a27ab75415237de96d2539e86b959ad0a9d0:/print-udp.c

diff --git a/print-udp.c b/print-udp.c
index ec40f2ce..9daf327d 100644
--- a/print-udp.c
+++ b/print-udp.c
@@ -132,6 +132,7 @@ vat_print(netdissect_options *ndo, const void *hdr, u_int length)
 		if (i0 & 0x3f000000)
 			ND_PRINT(" s%u", (i0 >> 24) & 0x3f);
 	}
+	return;
 
 trunc:
 	nd_print_trunc(ndo);
@@ -221,6 +222,7 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len)
 		if (contype == 0x1f) /*XXX H.261 */
 			ND_PRINT(" 0x%04x", EXTRACT_BE_U_4(ip) >> 16);
 	}
+	return;
 
 trunc:
 	nd_print_trunc(ndo);
@@ -311,7 +313,7 @@ trunc:
 	return ep;
 }
 
-static int udp_cksum(netdissect_options *ndo, const struct ip *ip,
+static uint16_t udp_cksum(netdissect_options *ndo, const struct ip *ip,
 		     const struct udphdr *up,
 		     u_int len)
 {
@@ -319,7 +321,7 @@ static int udp_cksum(netdissect_options *ndo, const struct ip *ip,
 				IPPROTO_UDP);
 }
 
-static int udp6_cksum(netdissect_options *ndo, const struct ip6_hdr *ip6,
+static uint16_t udp6_cksum(netdissect_options *ndo, const struct ip6_hdr *ip6,
 		      const struct udphdr *up, u_int len)
 {
 	return nextproto6_cksum(ndo, ip6, (const uint8_t *)(const void *)up, len, len,
@@ -449,6 +451,7 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 
 		case PT_RPC:
 			rp = (const struct sunrpc_msg *)(up + 1);
+			ND_TCHECK_4(rp->rm_direction);
 			direction = (enum sunrpc_msg_type) EXTRACT_BE_U_4(rp->rm_direction);
 			if (direction == SUNRPC_CALL)
 				sunrpc_print(ndo, (const u_char *)rp, length,
@@ -553,6 +556,7 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 		 * TCP does, and we do so for UDP-over-IPv6.
 		 */
 	        if (IP_V(ip) == 4 && (ndo->ndo_vflag > 1)) {
+			ND_TCHECK_2(up->uh_sum);
 			udp_sum = EXTRACT_BE_U_2(up->uh_sum);
 			if (udp_sum == 0) {
 				ND_PRINT("[no cksum] ");
@@ -571,6 +575,7 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 			/* for IPv6, UDP checksum is mandatory */
 			if (ND_TTEST_LEN(cp, length)) {
 				sum = udp6_cksum(ndo, ip6, up, length + sizeof(struct udphdr));
+				ND_TCHECK_2(up->uh_sum);
 				udp_sum = EXTRACT_BE_U_2(up->uh_sum);
 
 	                        if (sum != 0) {
@@ -610,7 +615,7 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 		else if (IS_SRC_OR_DST_PORT(NTP_PORT))
 			ntp_print(ndo, (const u_char *)(up + 1), length);
 		else if (IS_SRC_OR_DST_PORT(KERBEROS_PORT) || IS_SRC_OR_DST_PORT(KERBEROS_SEC_PORT))
-			krb_print(ndo, (const void *)(up + 1));
+			krb_print(ndo, (const u_char *)(up + 1));
 		else if (IS_SRC_OR_DST_PORT(L2TP_PORT))
 			l2tp_print(ndo, (const u_char *)(up + 1), length);
 #ifdef ENABLE_SMB
@@ -622,14 +627,14 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 		else if (dport == VAT_PORT)
 			vat_print(ndo, (const void *)(up + 1), length);
 		else if (IS_SRC_OR_DST_PORT(ZEPHYR_SRV_PORT) || IS_SRC_OR_DST_PORT(ZEPHYR_CLT_PORT))
-			zephyr_print(ndo, (const void *)(up + 1), length);
+			zephyr_print(ndo, (const u_char *)(up + 1), length);
 		/*
 		 * Since there are 10 possible ports to check, I think
 		 * a <> test would be more efficient
 		 */
 		else if ((sport >= RX_PORT_LOW && sport <= RX_PORT_HIGH) ||
 			 (dport >= RX_PORT_LOW && dport <= RX_PORT_HIGH))
-			rx_print(ndo, (const void *)(up + 1), length, sport, dport,
+			rx_print(ndo, (const u_char *)(up + 1), length, sport, dport,
 				 (const u_char *) ip);
 		else if (IS_SRC_OR_DST_PORT(RIPNG_PORT))
 			ripng_print(ndo, (const u_char *)(up + 1), length);
@@ -647,7 +652,7 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 		else if (dport == WB_PORT)
 			wb_print(ndo, (const u_char *)(up + 1), length);
 		else if (IS_SRC_OR_DST_PORT(CISCO_AUTORP_PORT))
-			cisco_autorp_print(ndo, (const void *)(up + 1), length);
+			cisco_autorp_print(ndo, (const u_char *)(up + 1), length);
 		else if (IS_SRC_OR_DST_PORT(RADIUS_PORT) ||
 			 IS_SRC_OR_DST_PORT(RADIUS_NEW_PORT) ||
 			 IS_SRC_OR_DST_PORT(RADIUS_ACCOUNTING_PORT) ||