Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.158.2.1
retrieving revision 1.164
diff -u -p -r1.158.2.1 -r1.164
--- src/sys/netinet/udp_usrreq.c	2007/06/08 14:17:48	1.158.2.1
+++ src/sys/netinet/udp_usrreq.c	2008/04/06 20:17:27	1.164
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp_usrreq.c,v 1.158.2.1 2007/06/08 14:17:48 ad Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.164 2008/04/06 20:17:27 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.158.2.1 2007/06/08 14:17:48 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.164 2008/04/06 20:17:27 thorpej Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -143,7 +143,8 @@ int	udpcksum = 1;
 int	udp_do_loopback_cksum = 0;
 
 struct	inpcbtable udbtable;
-struct	udpstat udpstat;
+
+uint64_t	udpstat[UDP_NSTATS];
 
 #ifdef INET
 #ifdef IPSEC_NAT_T
@@ -324,7 +325,7 @@ udp4_input_checksum(struct mbuf *m, cons
 	return 0;
 
 badcsum:
-	udpstat.udps_badsum++;
+	udpstat[UDP_STAT_BADSUM]++;
 	return -1;
 }
 
@@ -346,7 +347,7 @@ udp_input(struct mbuf *m, ...)
 	va_end(ap);
 
 	MCLAIM(m, &udp_rx_mowner);
-	udpstat.udps_ipackets++;
+	udpstat[UDP_STAT_IPACKETS]++;
 
 	/*
 	 * Get IP and UDP header together in first mbuf.
@@ -354,7 +355,7 @@ udp_input(struct mbuf *m, ...)
 	ip = mtod(m, struct ip *);
 	IP6_EXTHDR_GET(uh, struct udphdr *, m, iphlen, sizeof(struct udphdr));
 	if (uh == NULL) {
-		udpstat.udps_hdrops++;
+		udpstat[UDP_STAT_HDROPS]++;
 		return;
 	}
 	KASSERT(UDP_HDR_ALIGNED_P(uh));
@@ -371,7 +372,7 @@ udp_input(struct mbuf *m, ...)
 	len = ntohs((u_int16_t)uh->uh_ulen);
 	if (ip_len != iphlen + len) {
 		if (ip_len < iphlen + len || len < sizeof(struct udphdr)) {
-			udpstat.udps_badlen++;
+			udpstat[UDP_STAT_BADLEN]++;
 			goto bad;
 		}
 		m_adj(m, iphlen + len - ip_len);
@@ -388,7 +389,7 @@ udp_input(struct mbuf *m, ...)
 	sockaddr_in_init(&dst, &ip->ip_dst, uh->uh_dport);
 
 	if ((n = udp4_realinput(&src, &dst, &m, iphlen)) == -1) {
-		udpstat.udps_hdrops++;
+		udpstat[UDP_STAT_HDROPS]++;
 		return;
 	}
 #ifdef INET6
@@ -416,10 +417,10 @@ udp_input(struct mbuf *m, ...)
 
 	if (n == 0) {
 		if (m->m_flags & (M_BCAST | M_MCAST)) {
-			udpstat.udps_noportbcast++;
+			udpstat[UDP_STAT_NOPORTBCAST]++;
 			goto bad;
 		}
-		udpstat.udps_noport++;
+		udpstat[UDP_STAT_NOPORT]++;
 #ifdef IPKDB
 		if (checkipkdb(&ip->ip_src, uh->uh_sport, uh->uh_dport,
 				m, iphlen + sizeof(struct udphdr),
@@ -617,14 +618,14 @@ udp4_sendup(struct mbuf *m, int off /* o
 	/* check AH/ESP integrity. */
 	if (so != NULL && ipsec4_in_reject_so(m, so)) {
 		ipsecstat.in_polvio++;
-		if ((n = m_copy(m, 0, M_COPYALL)) != NULL)
+		if ((n = m_copypacket(m, M_DONTWAIT)) != NULL)
 			icmp_error(n, ICMP_UNREACH, ICMP_UNREACH_ADMIN_PROHIBIT,
 			    0, 0);
 		return;
 	}
 #endif /*IPSEC*/
 
-	if ((n = m_copy(m, 0, M_COPYALL)) != NULL) {
+	if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) {
 		if (inp && (inp->inp_flags & INP_CONTROLOPTS
 			 || so->so_options & SO_TIMESTAMP)) {
 			struct ip *ip = mtod(n, struct ip *);
@@ -638,7 +639,7 @@ udp4_sendup(struct mbuf *m, int off /* o
 			if (opts)
 				m_freem(opts);
 			so->so_rcv.sb_overflowed++;
-			udpstat.udps_fullsock++;
+			udpstat[UDP_STAT_FULLSOCK]++;
 		} else
 			sorwakeup(so);
 	}
@@ -664,14 +665,14 @@ udp6_sendup(struct mbuf *m, int off /* o
 	/* check AH/ESP integrity. */
 	if (so != NULL && ipsec6_in_reject_so(m, so)) {
 		ipsec6stat.in_polvio++;
-		if ((n = m_copy(m, 0, M_COPYALL)) != NULL)
+		if ((n = m_copypacket(m, M_DONTWAIT)) != NULL)
 			icmp6_error(n, ICMP6_DST_UNREACH,
 			    ICMP6_DST_UNREACH_ADMIN, 0);
 		return;
 	}
 #endif /*IPSEC*/
 
-	if ((n = m_copy(m, 0, M_COPYALL)) != NULL) {
+	if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) {
 		if (in6p && (in6p->in6p_flags & IN6P_CONTROLOPTS
 			  || in6p->in6p_socket->so_options & SO_TIMESTAMP)) {
 			struct ip6_hdr *ip6 = mtod(n, struct ip6_hdr *);
@@ -778,7 +779,7 @@ udp4_realinput(struct sockaddr_in *src, 
 		 */
 		inp = in_pcblookup_connect(&udbtable, *src4, *sport, *dst4, *dport);
 		if (inp == 0) {
-			++udpstat.udps_pcbhashmiss;
+			udpstat[UDP_STAT_PCBHASHMISS]++;
 			inp = in_pcblookup_bind(&udbtable, *dst4, *dport);
 			if (inp == 0)
 				return rcvcnt;
@@ -926,7 +927,7 @@ udp6_realinput(int af, struct sockaddr_i
 		in6p = in6_pcblookup_connect(&udbtable, &src6, sport, dst6,
 		    dport, 0);
 		if (in6p == 0) {
-			++udpstat.udps_pcbhashmiss;
+			udpstat[UDP_STAT_PCBHASHMISS]++;
 			in6p = in6_pcblookup_bind(&udbtable, dst6, dport, 0);
 			if (in6p == 0)
 				return rcvcnt;
@@ -1029,7 +1030,7 @@ udp_ctloutput(int op, struct socket *so,
 
 		switch (optname) {
 		case UDP_ENCAP:
-			if (m == NULL || m->m_len < sizeof (int)) {
+			if (m == NULL || m->m_len != sizeof(int)) {
 				error = EINVAL;
 				break;
 			}
@@ -1142,7 +1143,7 @@ udp_output(struct mbuf *m, ...)
 	((struct ip *)ui)->ip_len = htons(sizeof (struct udpiphdr) + len);
 	((struct ip *)ui)->ip_ttl = inp->inp_ip.ip_ttl;	/* XXX */
 	((struct ip *)ui)->ip_tos = inp->inp_ip.ip_tos;	/* XXX */
-	udpstat.udps_opackets++;
+	udpstat[UDP_STAT_OPACKETS]++;
 
 	return (ip_output(m, inp->inp_options, ro,
 	    inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST),
@@ -1391,7 +1392,7 @@ SYSCTL_SETUP(sysctl_net_inet_udp_setup, 
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_STRUCT, "stats",
 		       SYSCTL_DESCR("UDP statistics"),
-		       NULL, 0, &udpstat, sizeof(udpstat),
+		       NULL, 0, udpstat, sizeof(udpstat),
 		       CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS,
 		       CTL_EOL);
 }
@@ -1528,7 +1529,7 @@ udp4_espinudp(struct mbuf **mp, int off,
 	m_tag_prepend(n, tag);
 
 #ifdef FAST_IPSEC
-	ipsec4_common_input(n, iphdrlen);
+	ipsec4_common_input(n, iphdrlen, IPPROTO_ESP);
 #else
 	esp4_input(n, iphdrlen);
 #endif