X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/aeb105bfbf67730c83bd85900dba07bba050a047..fe4ef2d22bcc1b89f16c30480f7bff4348d1a014:/print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 69173a69..a9f5cf99 100644
--- a/print-udp.c
+++ b/print-udp.c
@@ -22,10 +22,10 @@
 /* \summary: UDP printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
@@ -97,46 +97,51 @@ struct rtcp_rr {
 #define RTCP_PT_APP	204
 
 static void
-vat_print(netdissect_options *ndo, const void *hdr, const struct udphdr *up)
+vat_print(netdissect_options *ndo, const void *hdr, u_int length)
 {
 	/* vat/vt audio */
 	u_int ts;
 
+	if (length < 2) {
+		ND_PRINT("udp/va/vat, length %u < 2", length);
+		return;
+	}
 	ND_TCHECK_2((const u_int *)hdr);
 	ts = EXTRACT_BE_U_2(hdr);
 	if ((ts & 0xf060) != 0) {
 		/* probably vt */
-		ND_TCHECK_2(up->uh_ulen);
-		ND_PRINT((ndo, "udp/vt %u %d / %d",
-			     (uint32_t)(EXTRACT_BE_U_2(up->uh_ulen) - sizeof(*up)),
-			     ts & 0x3ff, ts >> 10));
+		ND_PRINT("udp/vt %u %u / %u",
+			     length,
+			     ts & 0x3ff, ts >> 10);
 	} else {
 		/* probably vat */
 		uint32_t i0, i1;
 
+		if (length < 8) {
+			ND_PRINT("udp/vat, length %u < 8", length);
+			return;
+		}
 		ND_TCHECK_4(&((const u_int *)hdr)[0]);
 		i0 = EXTRACT_BE_U_4(&((const u_int *)hdr)[0]);
 		ND_TCHECK_4(&((const u_int *)hdr)[1]);
 		i1 = EXTRACT_BE_U_4(&((const u_int *)hdr)[1]);
-		ND_TCHECK_2(up->uh_ulen);
-		ND_PRINT((ndo, "udp/vat %u c%d %u%s",
-			(uint32_t)(EXTRACT_BE_U_2(up->uh_ulen) - sizeof(*up) - 8),
+		ND_PRINT("udp/vat %u c%u %u%s",
+			length - 8,
 			i0 & 0xffff,
-			i1, i0 & 0x800000? "*" : ""));
+			i1, i0 & 0x800000? "*" : "");
 		/* audio format */
 		if (i0 & 0x1f0000)
-			ND_PRINT((ndo, " f%d", (i0 >> 16) & 0x1f));
+			ND_PRINT(" f%u", (i0 >> 16) & 0x1f);
 		if (i0 & 0x3f000000)
-			ND_PRINT((ndo, " s%d", (i0 >> 24) & 0x3f));
+			ND_PRINT(" s%u", (i0 >> 24) & 0x3f);
 	}
 
 trunc:
-	ND_PRINT((ndo, "%s", vat_tstr));
+	ND_PRINT("%s", vat_tstr);
 }
 
 static void
-rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
-          const struct udphdr *up)
+rtp_print(netdissect_options *ndo, const void *hdr, u_int len)
 {
 	/* rtp v1 or v2 */
 	const u_int *ip = (const u_int *)hdr;
@@ -144,12 +149,15 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
 	uint32_t i0, i1;
 	const char * ptype;
 
+	if (len < 8) {
+		ND_PRINT("udp/rtp, length %u < 8", len);
+		return;
+	}
 	ND_TCHECK_4(&((const u_int *)hdr)[0]);
 	i0 = EXTRACT_BE_U_4(&((const u_int *)hdr)[0]);
 	ND_TCHECK_4(&((const u_int *)hdr)[1]);
 	i1 = EXTRACT_BE_U_4(&((const u_int *)hdr)[1]);
-	ND_TCHECK_2(up->uh_ulen);
-	dlen = EXTRACT_BE_U_2(up->uh_ulen) - sizeof(*up) - 8;
+	dlen = len - 8;
 	ip += 2;
 	len >>= 2;
 	len -= 2;
@@ -163,6 +171,10 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
 		ptype = "rtpv1";
 	} else {
 		/* rtp v2 - RFC 3550 */
+		if (dlen < 4) {
+			ND_PRINT("udp/rtp, length %u < 12", dlen + 8);
+			return;
+		}
 		hasext = i0 & 0x10000000;
 		contype = (i0 >> 16) & 0x7f;
 		hasmarker = i0 & 0x800000;
@@ -171,17 +183,17 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
 		ip += 1;
 		len -= 1;
 	}
-	ND_PRINT((ndo, "udp/%s %d c%d %s%s %d %u",
+	ND_PRINT("udp/%s %u c%u %s%s %u %u",
 		ptype,
 		dlen,
 		contype,
 		(hasopt || hasext)? "+" : "",
 		hasmarker? "*" : "",
 		i0 & 0xffff,
-		i1));
+		i1);
 	if (ndo->ndo_vflag) {
 		ND_TCHECK_4(&((const u_int *)hdr)[2]);
-		ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(&((const u_int *)hdr)[2])));
+		ND_PRINT(" %u", EXTRACT_BE_U_4(&((const u_int *)hdr)[2]));
 		if (hasopt) {
 			u_int i2, optlen;
 			do {
@@ -189,7 +201,7 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
 				i2 = EXTRACT_BE_U_4(ip);
 				optlen = (i2 >> 16) & 0xff;
 				if (optlen == 0 || optlen > len) {
-					ND_PRINT((ndo, " !opt"));
+					ND_PRINT(" !opt");
 					return;
 				}
 				ip += optlen;
@@ -202,18 +214,18 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
 			i2 = EXTRACT_BE_U_4(ip);
 			extlen = (i2 & 0xffff) + 1;
 			if (extlen > len) {
-				ND_PRINT((ndo, " !ext"));
+				ND_PRINT(" !ext");
 				return;
 			}
 			ip += extlen;
 		}
 		ND_TCHECK_4(ip);
 		if (contype == 0x1f) /*XXX H.261 */
-			ND_PRINT((ndo, " 0x%04x", EXTRACT_BE_U_4(ip) >> 16));
+			ND_PRINT(" 0x%04x", EXTRACT_BE_U_4(ip) >> 16);
 	}
 
 trunc:
-	ND_PRINT((ndo, "%s", rtp_tstr));
+	ND_PRINT("%s", rtp_tstr);
 }
 
 static const u_char *
@@ -225,76 +237,77 @@ rtcp_print(netdissect_options *ndo, const u_char *hdr, const u_char *ep)
 	const struct rtcphdr *rh = (const struct rtcphdr *)hdr;
 	u_int len;
 	uint16_t flags;
-	int cnt;
+	u_int cnt;
 	double ts, dts;
 	if ((const u_char *)(rh + 1) > ep)
 		goto trunc;
-	ND_TCHECK(*rh);
+	ND_TCHECK_SIZE(rh);
 	len = (EXTRACT_BE_U_2(rh->rh_len) + 1) * 4;
 	flags = EXTRACT_BE_U_2(rh->rh_flags);
 	cnt = (flags >> 8) & 0x1f;
 	switch (flags & 0xff) {
 	case RTCP_PT_SR:
 		sr = (const struct rtcp_sr *)(rh + 1);
-		ND_PRINT((ndo, " sr"));
+		ND_PRINT(" sr");
 		if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))
-			ND_PRINT((ndo, " [%d]", len));
+			ND_PRINT(" [%u]", len);
 		if (ndo->ndo_vflag)
-			ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(rh->rh_ssrc)));
+			ND_PRINT(" %u", EXTRACT_BE_U_4(rh->rh_ssrc));
 		if ((const u_char *)(sr + 1) > ep)
 			goto trunc;
-		ND_TCHECK(*sr);
+		ND_TCHECK_SIZE(sr);
 		ts = (double)(EXTRACT_BE_U_4(sr->sr_ntp.upper)) +
 		    ((double)(EXTRACT_BE_U_4(sr->sr_ntp.lower)) /
 		     4294967296.0);
-		ND_PRINT((ndo, " @%.2f %u %up %ub", ts, EXTRACT_BE_U_4(sr->sr_ts),
-			  EXTRACT_BE_U_4(sr->sr_np), EXTRACT_BE_U_4(sr->sr_nb)));
+		ND_PRINT(" @%.2f %u %up %ub", ts, EXTRACT_BE_U_4(sr->sr_ts),
+			  EXTRACT_BE_U_4(sr->sr_np), EXTRACT_BE_U_4(sr->sr_nb));
 		rr = (const struct rtcp_rr *)(sr + 1);
 		break;
 	case RTCP_PT_RR:
-		ND_PRINT((ndo, " rr"));
+		ND_PRINT(" rr");
 		if (len != cnt * sizeof(*rr) + sizeof(*rh))
-			ND_PRINT((ndo, " [%d]", len));
+			ND_PRINT(" [%u]", len);
 		rr = (const struct rtcp_rr *)(rh + 1);
 		if (ndo->ndo_vflag)
-			ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(rh->rh_ssrc)));
+			ND_PRINT(" %u", EXTRACT_BE_U_4(rh->rh_ssrc));
 		break;
 	case RTCP_PT_SDES:
-		ND_PRINT((ndo, " sdes %d", len));
+		ND_PRINT(" sdes %u", len);
 		if (ndo->ndo_vflag)
-			ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(rh->rh_ssrc)));
+			ND_PRINT(" %u", EXTRACT_BE_U_4(rh->rh_ssrc));
 		cnt = 0;
 		break;
 	case RTCP_PT_BYE:
-		ND_PRINT((ndo, " bye %d", len));
+		ND_PRINT(" bye %u", len);
 		if (ndo->ndo_vflag)
-			ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(rh->rh_ssrc)));
+			ND_PRINT(" %u", EXTRACT_BE_U_4(rh->rh_ssrc));
 		cnt = 0;
 		break;
 	default:
-		ND_PRINT((ndo, " type-0x%x %d", flags & 0xff, len));
+		ND_PRINT(" type-0x%x %u", flags & 0xff, len);
 		cnt = 0;
 		break;
 	}
 	if (cnt > 1)
-		ND_PRINT((ndo, " c%d", cnt));
-	while (--cnt >= 0) {
+		ND_PRINT(" c%u", cnt);
+	while (cnt != 0) {
 		if ((const u_char *)(rr + 1) > ep)
 			goto trunc;
-		ND_TCHECK(*rr);
+		ND_TCHECK_SIZE(rr);
 		if (ndo->ndo_vflag)
-			ND_PRINT((ndo, " %u", EXTRACT_BE_U_4(rr->rr_srcid)));
+			ND_PRINT(" %u", EXTRACT_BE_U_4(rr->rr_srcid));
 		ts = (double)(EXTRACT_BE_U_4(rr->rr_lsr)) / 65536.;
 		dts = (double)(EXTRACT_BE_U_4(rr->rr_dlsr)) / 65536.;
-		ND_PRINT((ndo, " %ul %us %uj @%.2f+%.2f",
+		ND_PRINT(" %ul %us %uj @%.2f+%.2f",
 		    EXTRACT_BE_U_4(rr->rr_nl) & 0x00ffffff,
 		    EXTRACT_BE_U_4(rr->rr_ls),
-		    EXTRACT_BE_U_4(rr->rr_dv), ts, dts));
+		    EXTRACT_BE_U_4(rr->rr_dv), ts, dts);
+		cnt--;
 	}
 	return (hdr + len);
 
 trunc:
-	ND_PRINT((ndo, "%s", rtcp_tstr));
+	ND_PRINT("%s", rtcp_tstr);
 	return ep;
 }
 
@@ -326,41 +339,41 @@ udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dpo
 	if (ip6) {
 		if (EXTRACT_U_1(ip6->ip6_nxt) == IPPROTO_UDP) {
 			if (sport == -1) {
-				ND_PRINT((ndo, "%s > %s: ",
+				ND_PRINT("%s > %s: ",
 					ip6addr_string(ndo, &ip6->ip6_src),
-					ip6addr_string(ndo, &ip6->ip6_dst)));
+					ip6addr_string(ndo, &ip6->ip6_dst));
 			} else {
-				ND_PRINT((ndo, "%s.%s > %s.%s: ",
+				ND_PRINT("%s.%s > %s.%s: ",
 					ip6addr_string(ndo, &ip6->ip6_src),
 					udpport_string(ndo, sport),
 					ip6addr_string(ndo, &ip6->ip6_dst),
-					udpport_string(ndo, dport)));
+					udpport_string(ndo, dport));
 			}
 		} else {
 			if (sport != -1) {
-				ND_PRINT((ndo, "%s > %s: ",
+				ND_PRINT("%s > %s: ",
 					udpport_string(ndo, sport),
-					udpport_string(ndo, dport)));
+					udpport_string(ndo, dport));
 			}
 		}
 	} else {
 		if (EXTRACT_U_1(ip->ip_p) == IPPROTO_UDP) {
 			if (sport == -1) {
-				ND_PRINT((ndo, "%s > %s: ",
+				ND_PRINT("%s > %s: ",
 					ipaddr_string(ndo, &ip->ip_src),
-					ipaddr_string(ndo, &ip->ip_dst)));
+					ipaddr_string(ndo, &ip->ip_dst));
 			} else {
-				ND_PRINT((ndo, "%s.%s > %s.%s: ",
+				ND_PRINT("%s.%s > %s.%s: ",
 					ipaddr_string(ndo, &ip->ip_src),
 					udpport_string(ndo, sport),
 					ipaddr_string(ndo, &ip->ip_dst),
-					udpport_string(ndo, dport)));
+					udpport_string(ndo, dport));
 			}
 		} else {
 			if (sport != -1) {
-				ND_PRINT((ndo, "%s > %s: ",
+				ND_PRINT("%s > %s: ",
 					udpport_string(ndo, sport),
-					udpport_string(ndo, dport)));
+					udpport_string(ndo, dport));
 			}
 		}
 	}
@@ -385,7 +398,7 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 		ip6 = (const struct ip6_hdr *)bp2;
 	else
 		ip6 = NULL;
-	if (!ND_TTEST(up->uh_dport)) {
+	if (!ND_TTEST_2(up->uh_dport)) {
 		udpipaddr_print(ndo, ip, -1, -1);
 		goto trunc;
 	}
@@ -395,17 +408,17 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 
 	if (length < sizeof(struct udphdr)) {
 		udpipaddr_print(ndo, ip, sport, dport);
-		ND_PRINT((ndo, "truncated-udp %d", length));
+		ND_PRINT("truncated-udp %u", length);
 		return;
 	}
-	if (!ND_TTEST(up->uh_ulen)) {
+	if (!ND_TTEST_2(up->uh_ulen)) {
 		udpipaddr_print(ndo, ip, sport, dport);
 		goto trunc;
 	}
 	ulen = EXTRACT_BE_U_2(up->uh_ulen);
 	if (ulen < sizeof(struct udphdr)) {
 		udpipaddr_print(ndo, ip, sport, dport);
-		ND_PRINT((ndo, "truncated-udplength %d", ulen));
+		ND_PRINT("truncated-udplength %u", ulen);
 		return;
 	}
 	ulen -= sizeof(struct udphdr);
@@ -427,17 +440,17 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 
 		case PT_VAT:
 			udpipaddr_print(ndo, ip, sport, dport);
-			vat_print(ndo, (const void *)(up + 1), up);
+			vat_print(ndo, (const void *)(up + 1), length);
 			break;
 
 		case PT_WB:
 			udpipaddr_print(ndo, ip, sport, dport);
-			wb_print(ndo, (const void *)(up + 1), length);
+			wb_print(ndo, (const u_char *)(up + 1), length);
 			break;
 
 		case PT_RPC:
 			rp = (const struct sunrpc_msg *)(up + 1);
-			direction = (enum sunrpc_msg_type) EXTRACT_BE_U_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,
 				    (const u_char *)ip);
@@ -448,7 +461,7 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 
 		case PT_RTP:
 			udpipaddr_print(ndo, ip, sport, dport);
-			rtp_print(ndo, (const void *)(up + 1), length, up);
+			rtp_print(ndo, (const void *)(up + 1), length);
 			break;
 
 		case PT_RTCP:
@@ -507,16 +520,18 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 		enum sunrpc_msg_type direction;
 
 		rp = (const struct sunrpc_msg *)(up + 1);
-		if (ND_TTEST(rp->rm_direction)) {
-			direction = (enum sunrpc_msg_type) EXTRACT_BE_U_4(&rp->rm_direction);
+		if (ND_TTEST_4(rp->rm_direction)) {
+			direction = (enum sunrpc_msg_type) EXTRACT_BE_U_4(rp->rm_direction);
 			if (dport == NFS_PORT && direction == SUNRPC_CALL) {
-				ND_PRINT((ndo, "NFS request xid %u ", EXTRACT_BE_U_4(&rp->rm_xid)));
+				ND_PRINT("NFS request xid %u ",
+					 EXTRACT_BE_U_4(rp->rm_xid));
 				nfsreq_noaddr_print(ndo, (const u_char *)rp, length,
 				    (const u_char *)ip);
 				return;
 			}
 			if (sport == NFS_PORT && direction == SUNRPC_REPLY) {
-				ND_PRINT((ndo, "NFS reply xid %u ", EXTRACT_BE_U_4(&rp->rm_xid)));
+				ND_PRINT("NFS reply xid %u ",
+					 EXTRACT_BE_U_4(rp->rm_xid));
 				nfsreply_noaddr_print(ndo, (const u_char *)rp, length,
 				    (const u_char *)ip);
 				return;
@@ -541,16 +556,16 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 	        if (IP_V(ip) == 4 && (ndo->ndo_vflag > 1)) {
 			udp_sum = EXTRACT_BE_U_2(up->uh_sum);
 			if (udp_sum == 0) {
-				ND_PRINT((ndo, "[no cksum] "));
+				ND_PRINT("[no cksum] ");
 			} else if (ND_TTEST_LEN(cp, length)) {
 				sum = udp_cksum(ndo, ip, up, length + sizeof(struct udphdr));
 
 	                        if (sum != 0) {
-					ND_PRINT((ndo, "[bad udp cksum 0x%04x -> 0x%04x!] ",
+					ND_PRINT("[bad udp cksum 0x%04x -> 0x%04x!] ",
 					    udp_sum,
-					    in_cksum_shouldbe(udp_sum, sum)));
+					    in_cksum_shouldbe(udp_sum, sum));
 				} else
-					ND_PRINT((ndo, "[udp sum ok] "));
+					ND_PRINT("[udp sum ok] ");
 			}
 		}
 		else if (IP_V(ip) == 6 && ip6->ip6_plen) {
@@ -560,11 +575,11 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 				udp_sum = EXTRACT_BE_U_2(up->uh_sum);
 
 	                        if (sum != 0) {
-					ND_PRINT((ndo, "[bad udp cksum 0x%04x -> 0x%04x!] ",
+					ND_PRINT("[bad udp cksum 0x%04x -> 0x%04x!] ",
 					    udp_sum,
-					    in_cksum_shouldbe(udp_sum, sum)));
+					    in_cksum_shouldbe(udp_sum, sum));
 				} else
-					ND_PRINT((ndo, "[udp sum ok] "));
+					ND_PRINT("[udp sum ok] ");
 			}
 		}
 	}
@@ -606,7 +621,7 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 			nbt_udp138_print(ndo, (const u_char *)(up + 1), length);
 #endif
 		else if (dport == VAT_PORT)
-			vat_print(ndo, (const void *)(up + 1), up);
+			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);
 		/*
@@ -631,7 +646,7 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 		 * Kludge in test for whiteboard packets.
 		 */
 		else if (dport == WB_PORT)
-			wb_print(ndo, (const void *)(up + 1), length);
+			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);
 		else if (IS_SRC_OR_DST_PORT(RADIUS_PORT) ||
@@ -681,30 +696,30 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
 			lisp_print(ndo, (const u_char *)(up + 1), length);
 		else if (IS_SRC_OR_DST_PORT(VXLAN_GPE_PORT))
 			vxlan_gpe_print(ndo, (const u_char *)(up + 1), length);
-		else if (ND_TTEST(((const struct LAP *)cp)->type) &&
-		    EXTRACT_U_1(((const struct LAP *)cp)->type) == lapDDP &&
-		    (atalk_port(sport) || atalk_port(dport))) {
+		else if (ND_TTEST_1(((const struct LAP *)cp)->type) &&
+			 EXTRACT_U_1(((const struct LAP *)cp)->type) == lapDDP &&
+			 (atalk_port(sport) || atalk_port(dport))) {
 			if (ndo->ndo_vflag)
-				ND_PRINT((ndo, "kip "));
+				ND_PRINT("kip ");
 			llap_print(ndo, cp, length);
 		} else {
 			if (ulen > length)
-				ND_PRINT((ndo, "UDP, bad length %u > %u",
-				    ulen, length));
+				ND_PRINT("UDP, bad length %u > %u",
+				    ulen, length);
 			else
-				ND_PRINT((ndo, "UDP, length %u", ulen));
+				ND_PRINT("UDP, length %u", ulen);
 		}
 	} else {
 		if (ulen > length)
-			ND_PRINT((ndo, "UDP, bad length %u > %u",
-			    ulen, length));
+			ND_PRINT("UDP, bad length %u > %u",
+			    ulen, length);
 		else
-			ND_PRINT((ndo, "UDP, length %u", ulen));
+			ND_PRINT("UDP, length %u", ulen);
 	}
 	return;
 
 trunc:
-	ND_PRINT((ndo, "%s", udp_tstr));
+	ND_PRINT("%s", udp_tstr);
 }