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.134.2.4
retrieving revision 1.179
diff -u -p -r1.134.2.4 -r1.179
--- src/sys/netinet/udp_usrreq.c	2005/05/06 08:40:21	1.134.2.4
+++ src/sys/netinet/udp_usrreq.c	2009/09/16 15:23:05	1.179
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp_usrreq.c,v 1.134.2.4 2005/05/06 08:40:21 tron Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.179 2009/09/16 15:23:05 pooka Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,9 +61,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.134.2.4 2005/05/06 08:40:21 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.179 2009/09/16 15:23:05 pooka Exp $");
 
 #include "opt_inet.h"
+#include "opt_compat_netbsd.h"
 #include "opt_ipsec.h"
 #include "opt_inet_csum.h"
 #include "opt_ipkdb.h"
@@ -94,18 +95,17 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c
 #include <netinet/ip_icmp.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
-
-#ifdef IPSEC_NAT_T
-#include <netinet6/ipsec.h>
-#include <netinet6/esp.h>
-#endif
+#include <netinet/udp_private.h>
 
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
 #include <netinet6/ip6_var.h>
+#include <netinet6/ip6_private.h>
 #include <netinet6/in6_pcb.h>
 #include <netinet6/udp6_var.h>
+#include <netinet6/udp6_private.h>
+#include <netinet6/scope6_var.h>
 #endif
 
 #ifndef INET6
@@ -122,16 +122,24 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c
 
 #ifdef FAST_IPSEC
 #include <netipsec/ipsec.h>
-#include <netipsec/ipsec_var.h>			/* XXX ipsecstat namespace */
+#include <netipsec/ipsec_var.h>
+#include <netipsec/ipsec_private.h>
+#include <netipsec/esp.h>
 #ifdef INET6
 #include <netipsec/ipsec6.h>
 #endif
-#endif	/* FAST_IPSEC*/
+#endif	/* FAST_IPSEC */
 
 #ifdef IPSEC
 #include <netinet6/ipsec.h>
+#include <netinet6/ipsec_private.h>
+#include <netinet6/esp.h>
 #include <netkey/key.h>
-#endif /*IPSEC*/
+#endif /* IPSEC */
+
+#ifdef COMPAT_50
+#include <compat/sys/socket.h>
+#endif
 
 #ifdef IPKDB
 #include <ipkdb/ipkdb.h>
@@ -141,24 +149,22 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c
  * UDP protocol implementation.
  * Per RFC 768, August, 1980.
  */
-#ifndef	COMPAT_42
 int	udpcksum = 1;
-#else
-int	udpcksum = 0;		/* XXX */
-#endif
+int	udp_do_loopback_cksum = 0;
 
 struct	inpcbtable udbtable;
-struct	udpstat udpstat;
+
+percpu_t *udpstat_percpu;
 
 #ifdef INET
 #ifdef IPSEC_NAT_T
-static int udp4_espinudp (struct mbuf *, int, struct sockaddr *,
+static int udp4_espinudp (struct mbuf **, int, struct sockaddr *,
 	struct socket *);
 #endif
 static void udp4_sendup (struct mbuf *, int, struct sockaddr *,
 	struct socket *);
 static int udp4_realinput (struct sockaddr_in *, struct sockaddr_in *,
-	struct mbuf *, int);
+	struct mbuf **, int);
 static int udp4_input_checksum(struct mbuf *, const struct udphdr *, int, int);
 #endif
 #ifdef INET6
@@ -178,14 +184,15 @@ static	void udp_notify (struct inpcb *, 
 int	udbhashsize = UDBHASHSIZE;
 
 #ifdef MBUFTRACE
-struct mowner udp_mowner = { "udp" };
-struct mowner udp_rx_mowner = { "udp", "rx" };
-struct mowner udp_tx_mowner = { "udp", "tx" };
+struct mowner udp_mowner = MOWNER_INIT("udp", "");
+struct mowner udp_rx_mowner = MOWNER_INIT("udp", "rx");
+struct mowner udp_tx_mowner = MOWNER_INIT("udp", "tx");
 #endif
 
 #ifdef UDP_CSUM_COUNTERS
 #include <sys/device.h>
 
+#if defined(INET)
 struct evcnt udp_hwcsum_bad = EVCNT_INITIALIZER(EVCNT_TYPE_MISC,
     NULL, "udp", "hwcsum bad");
 struct evcnt udp_hwcsum_ok = EVCNT_INITIALIZER(EVCNT_TYPE_MISC,
@@ -195,12 +202,29 @@ struct evcnt udp_hwcsum_data = EVCNT_INI
 struct evcnt udp_swcsum = EVCNT_INITIALIZER(EVCNT_TYPE_MISC,
     NULL, "udp", "swcsum");
 
-#define	UDP_CSUM_COUNTER_INCR(ev)	(ev)->ev_count++
-
 EVCNT_ATTACH_STATIC(udp_hwcsum_bad);
 EVCNT_ATTACH_STATIC(udp_hwcsum_ok);
 EVCNT_ATTACH_STATIC(udp_hwcsum_data);
 EVCNT_ATTACH_STATIC(udp_swcsum);
+#endif /* defined(INET) */
+
+#if defined(INET6)
+struct evcnt udp6_hwcsum_bad = EVCNT_INITIALIZER(EVCNT_TYPE_MISC,
+    NULL, "udp6", "hwcsum bad");
+struct evcnt udp6_hwcsum_ok = EVCNT_INITIALIZER(EVCNT_TYPE_MISC,
+    NULL, "udp6", "hwcsum ok");
+struct evcnt udp6_hwcsum_data = EVCNT_INITIALIZER(EVCNT_TYPE_MISC,
+    NULL, "udp6", "hwcsum data");
+struct evcnt udp6_swcsum = EVCNT_INITIALIZER(EVCNT_TYPE_MISC,
+    NULL, "udp6", "swcsum");
+
+EVCNT_ATTACH_STATIC(udp6_hwcsum_bad);
+EVCNT_ATTACH_STATIC(udp6_hwcsum_ok);
+EVCNT_ATTACH_STATIC(udp6_hwcsum_data);
+EVCNT_ATTACH_STATIC(udp6_swcsum);
+#endif /* defined(INET6) */
+
+#define	UDP_CSUM_COUNTER_INCR(ev)	(ev)->ev_count++
 
 #else
 
@@ -208,15 +232,26 @@ EVCNT_ATTACH_STATIC(udp_swcsum);
 
 #endif /* UDP_CSUM_COUNTERS */
 
+static void sysctl_net_inet_udp_setup(struct sysctllog **);
+
 void
 udp_init(void)
 {
 
+	sysctl_net_inet_udp_setup(NULL);
+
 	in_pcbinit(&udbtable, udbhashsize, udbhashsize);
 
 	MOWNER_ATTACH(&udp_tx_mowner);
 	MOWNER_ATTACH(&udp_rx_mowner);
 	MOWNER_ATTACH(&udp_mowner);
+
+#ifdef INET
+	udpstat_percpu = percpu_alloc(sizeof(uint64_t) * UDP_NSTATS);
+#endif
+#ifdef INET6
+	udp6stat_percpu = percpu_alloc(sizeof(uint64_t) * UDP6_NSTATS);
+#endif
 }
 
 /*
@@ -311,7 +346,7 @@ udp4_input_checksum(struct mbuf *m, cons
 	return 0;
 
 badcsum:
-	udpstat.udps_badsum++;
+	UDP_STATINC(UDP_STAT_BADSUM);
 	return -1;
 }
 
@@ -333,7 +368,7 @@ udp_input(struct mbuf *m, ...)
 	va_end(ap);
 
 	MCLAIM(m, &udp_rx_mowner);
-	udpstat.udps_ipackets++;
+	UDP_STATINC(UDP_STAT_IPACKETS);
 
 	/*
 	 * Get IP and UDP header together in first mbuf.
@@ -341,7 +376,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++;
+		UDP_STATINC(UDP_STAT_HDROPS);
 		return;
 	}
 	KASSERT(UDP_HDR_ALIGNED_P(uh));
@@ -358,7 +393,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++;
+			UDP_STATINC(UDP_STAT_BADLEN);
 			goto bad;
 		}
 		m_adj(m, iphlen + len - ip_len);
@@ -371,34 +406,29 @@ udp_input(struct mbuf *m, ...)
 		goto badcsum;
 
 	/* construct source and dst sockaddrs. */
-	bzero(&src, sizeof(src));
-	src.sin_family = AF_INET;
-	src.sin_len = sizeof(struct sockaddr_in);
-	bcopy(&ip->ip_src, &src.sin_addr, sizeof(src.sin_addr));
-	src.sin_port = uh->uh_sport;
-	bzero(&dst, sizeof(dst));
-	dst.sin_family = AF_INET;
-	dst.sin_len = sizeof(struct sockaddr_in);
-	bcopy(&ip->ip_dst, &dst.sin_addr, sizeof(dst.sin_addr));
-	dst.sin_port = uh->uh_dport;
+	sockaddr_in_init(&src, &ip->ip_src, uh->uh_sport);
+	sockaddr_in_init(&dst, &ip->ip_dst, uh->uh_dport);
 
-	n = udp4_realinput(&src, &dst, m, iphlen);
+	if ((n = udp4_realinput(&src, &dst, &m, iphlen)) == -1) {
+		UDP_STATINC(UDP_STAT_HDROPS);
+		return;
+	}
 #ifdef INET6
 	if (IN_MULTICAST(ip->ip_dst.s_addr) || n == 0) {
 		struct sockaddr_in6 src6, dst6;
 
-		bzero(&src6, sizeof(src6));
+		memset(&src6, 0, sizeof(src6));
 		src6.sin6_family = AF_INET6;
 		src6.sin6_len = sizeof(struct sockaddr_in6);
 		src6.sin6_addr.s6_addr[10] = src6.sin6_addr.s6_addr[11] = 0xff;
-		bcopy(&ip->ip_src, &src6.sin6_addr.s6_addr[12],
+		memcpy(&src6.sin6_addr.s6_addr[12], &ip->ip_src,
 			sizeof(ip->ip_src));
 		src6.sin6_port = uh->uh_sport;
-		bzero(&dst6, sizeof(dst6));
+		memset(&dst6, 0, sizeof(dst6));
 		dst6.sin6_family = AF_INET6;
 		dst6.sin6_len = sizeof(struct sockaddr_in6);
 		dst6.sin6_addr.s6_addr[10] = dst6.sin6_addr.s6_addr[11] = 0xff;
-		bcopy(&ip->ip_dst, &dst6.sin6_addr.s6_addr[12],
+		memcpy(&dst6.sin6_addr.s6_addr[12], &ip->ip_dst,
 			sizeof(ip->ip_dst));
 		dst6.sin6_port = uh->uh_dport;
 
@@ -408,10 +438,10 @@ udp_input(struct mbuf *m, ...)
 
 	if (n == 0) {
 		if (m->m_flags & (M_BCAST | M_MCAST)) {
-			udpstat.udps_noportbcast++;
+			UDP_STATINC(UDP_STAT_NOPORTBCAST);
 			goto bad;
 		}
-		udpstat.udps_noport++;
+		UDP_STATINC(UDP_STAT_NOPORT);
 #ifdef IPKDB
 		if (checkipkdb(&ip->ip_src, uh->uh_sport, uh->uh_dport,
 				m, iphlen + sizeof(struct udphdr),
@@ -442,16 +472,46 @@ static int
 udp6_input_checksum(struct mbuf *m, const struct udphdr *uh, int off, int len)
 {
 
+	/*
+	 * XXX it's better to record and check if this mbuf is
+	 * already checked.
+	 */
+
 	if (__predict_false((m->m_flags & M_LOOP) && !udp_do_loopback_cksum)) {
 		goto good;
 	}
 	if (uh->uh_sum == 0) {
-		udp6stat.udp6s_nosum++;
+		UDP6_STATINC(UDP6_STAT_NOSUM);
 		goto bad;
 	}
-	if (in6_cksum(m, IPPROTO_UDP, off, len) != 0) {
-		udp6stat.udp6s_badsum++;
+
+	switch (m->m_pkthdr.csum_flags &
+	    ((m->m_pkthdr.rcvif->if_csum_flags_rx & M_CSUM_UDPv6) |
+	    M_CSUM_TCP_UDP_BAD | M_CSUM_DATA)) {
+	case M_CSUM_UDPv6|M_CSUM_TCP_UDP_BAD:
+		UDP_CSUM_COUNTER_INCR(&udp6_hwcsum_bad);
+		UDP6_STATINC(UDP6_STAT_BADSUM);
 		goto bad;
+
+#if 0 /* notyet */
+	case M_CSUM_UDPv6|M_CSUM_DATA:
+#endif
+
+	case M_CSUM_UDPv6:
+		/* Checksum was okay. */
+		UDP_CSUM_COUNTER_INCR(&udp6_hwcsum_ok);
+		break;
+
+	default:
+		/*
+		 * Need to compute it ourselves.  Maybe skip checksum
+		 * on loopback interfaces.
+		 */
+		UDP_CSUM_COUNTER_INCR(&udp6_swcsum);
+		if (in6_cksum(m, IPPROTO_UDP, off, len) != 0) {
+			UDP6_STATINC(UDP6_STAT_BADSUM);
+			goto bad;
+		}
 	}
 
 good:
@@ -480,13 +540,13 @@ udp6_input(struct mbuf **mp, int *offp, 
 	}
 #endif
 
-	udp6stat.udp6s_ipackets++;
+	UDP6_STATINC(UDP6_STAT_IPACKETS);
 
 	/* check for jumbogram is done in ip6_input.  we can trust pkthdr.len */
 	plen = m->m_pkthdr.len - off;
 	IP6_EXTHDR_GET(uh, struct udphdr *, m, off, sizeof(struct udphdr));
 	if (uh == NULL) {
-		ip6stat.ip6s_tooshort++;
+		IP6_STATINC(IP6_STAT_TOOSHORT);
 		return IPPROTO_DONE;
 	}
 	KASSERT(UDP_HDR_ALIGNED_P(uh));
@@ -499,7 +559,7 @@ udp6_input(struct mbuf **mp, int *offp, 
 		ulen = plen;
 
 	if (plen != ulen) {
-		udp6stat.udp6s_badlen++;
+		UDP6_STATINC(UDP6_STAT_BADLEN);
 		goto bad;
 	}
 
@@ -523,27 +583,24 @@ udp6_input(struct mbuf **mp, int *offp, 
 
 	/*
 	 * Construct source and dst sockaddrs.
-	 * Note that ifindex (s6_addr16[1]) is already filled.
 	 */
-	bzero(&src, sizeof(src));
+	memset(&src, 0, sizeof(src));
 	src.sin6_family = AF_INET6;
 	src.sin6_len = sizeof(struct sockaddr_in6);
-	/* KAME hack: recover scopeid */
-	(void)in6_recoverscope(&src, &ip6->ip6_src, m->m_pkthdr.rcvif);
+	src.sin6_addr = ip6->ip6_src;
 	src.sin6_port = uh->uh_sport;
-	bzero(&dst, sizeof(dst));
+	memset(&dst, 0, sizeof(dst));
 	dst.sin6_family = AF_INET6;
 	dst.sin6_len = sizeof(struct sockaddr_in6);
-	/* KAME hack: recover scopeid */
-	(void)in6_recoverscope(&dst, &ip6->ip6_dst, m->m_pkthdr.rcvif);
+	dst.sin6_addr = ip6->ip6_dst;
 	dst.sin6_port = uh->uh_dport;
 
 	if (udp6_realinput(AF_INET6, &src, &dst, m, off) == 0) {
 		if (m->m_flags & M_MCAST) {
-			udp6stat.udp6s_noportmcast++;
+			UDP6_STATINC(UDP6_STAT_NOPORTMCAST);
 			goto bad;
 		}
-		udp6stat.udp6s_noport++;
+		UDP6_STATINC(UDP6_STAT_NOPORT);
 		icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0);
 		m = NULL;
 	}
@@ -581,16 +638,19 @@ udp4_sendup(struct mbuf *m, int off /* o
 #if defined(IPSEC) || defined(FAST_IPSEC)
 	/* 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)
+		IPSEC_STATINC(IPSEC_STAT_IN_POLVIO);
+		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
+#ifdef SO_OTIMESTAMP
+			 || so->so_options & SO_OTIMESTAMP
+#endif
 			 || so->so_options & SO_TIMESTAMP)) {
 			struct ip *ip = mtod(n, struct ip *);
 			ip_savecontrol(inp, &opts, ip, n);
@@ -603,7 +663,7 @@ udp4_sendup(struct mbuf *m, int off /* o
 			if (opts)
 				m_freem(opts);
 			so->so_rcv.sb_overflowed++;
-			udpstat.udps_fullsock++;
+			UDP_STATINC(UDP_STAT_FULLSOCK);
 		} else
 			sorwakeup(so);
 	}
@@ -628,17 +688,20 @@ udp6_sendup(struct mbuf *m, int off /* o
 #if defined(IPSEC) || defined(FAST_IPSEC)
 	/* 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)
+		IPSEC6_STATINC(IPSEC_STAT_IN_POLVIO);
+		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)) {
+#ifdef SO_OTIMESTAMP
+		    || in6p->in6p_socket->so_options & SO_OTIMESTAMP
+#endif
+		    || in6p->in6p_socket->so_options & SO_TIMESTAMP)) {
 			struct ip6_hdr *ip6 = mtod(n, struct ip6_hdr *);
 			ip6_savecontrol(in6p, &opts, ip6, n);
 		}
@@ -649,7 +712,7 @@ udp6_sendup(struct mbuf *m, int off /* o
 			if (opts)
 				m_freem(opts);
 			so->so_rcv.sb_overflowed++;
-			udp6stat.udp6s_fullsock++;
+			UDP6_STATINC(UDP6_STAT_FULLSOCK);
 		} else
 			sorwakeup(so);
 	}
@@ -659,13 +722,14 @@ udp6_sendup(struct mbuf *m, int off /* o
 #ifdef INET
 static int
 udp4_realinput(struct sockaddr_in *src, struct sockaddr_in *dst,
-	struct mbuf *m, int off /* offset of udphdr */)
+	struct mbuf **mp, int off /* offset of udphdr */)
 {
 	u_int16_t *sport, *dport;
 	int rcvcnt;
 	struct in_addr *src4, *dst4;
 	struct inpcb_hdr *inph;
 	struct inpcb *inp;
+	struct mbuf *m = *mp;
 
 	rcvcnt = 0;
 	off += sizeof(struct udphdr);	/* now, offset of payload */
@@ -742,7 +806,7 @@ udp4_realinput(struct sockaddr_in *src, 
 		 */
 		inp = in_pcblookup_connect(&udbtable, *src4, *sport, *dst4, *dport);
 		if (inp == 0) {
-			++udpstat.udps_pcbhashmiss;
+			UDP_STATINC(UDP_STAT_PCBHASHMISS);
 			inp = in_pcblookup_bind(&udbtable, *dst4, *dport);
 			if (inp == 0)
 				return rcvcnt;
@@ -753,15 +817,35 @@ udp4_realinput(struct sockaddr_in *src, 
 		if (inp->inp_flags & INP_ESPINUDP_ALL) {
 			struct sockaddr *sa = (struct sockaddr *)src;
 
-			if (udp4_espinudp(m, off, sa, inp->inp_socket) != 0) {
+			switch(udp4_espinudp(mp, off, sa, inp->inp_socket)) {
+			case -1: 	/* Error, m was freeed */
+				rcvcnt = -1;
+				goto bad;
+				break;
+
+			case 1:		/* ESP over UDP */
 				rcvcnt++;
 				goto bad;
-			}
+				break;
 
-			/* Normal UDP processing will take place */
+			case 0: 	/* plain UDP */
+			default: 	/* Unexpected */
+				/* 
+				 * Normal UDP processing will take place 
+				 * m may have changed.
+				 */
+				m = *mp;
+				break;
+			}
 		}
 #endif
 
+		/*
+		 * Check the minimum TTL for socket.
+		 */
+		if (mtod(m, struct ip *)->ip_ttl < inp->inp_ip_minttl)
+			goto bad;
+
 		udp4_sendup(m, off, (struct sockaddr *)src, inp->inp_socket);
 		rcvcnt++;
 	}
@@ -778,7 +862,7 @@ udp6_realinput(int af, struct sockaddr_i
 {
 	u_int16_t sport, dport;
 	int rcvcnt;
-	struct in6_addr src6, dst6;
+	struct in6_addr src6, *dst6;
 	const struct in_addr *dst4;
 	struct inpcb_hdr *inph;
 	struct in6pcb *in6p;
@@ -791,13 +875,18 @@ udp6_realinput(int af, struct sockaddr_i
 	if (src->sin6_family != AF_INET6 || dst->sin6_family != AF_INET6)
 		goto bad;
 
-	in6_embedscope(&src6, src, NULL, NULL);
+	src6 = src->sin6_addr;
+	if (sa6_recoverscope(src) != 0) {
+		/* XXX: should be impossible. */
+		goto bad;
+	}
 	sport = src->sin6_port;
-	in6_embedscope(&dst6, dst, NULL, NULL);
+
 	dport = dst->sin6_port;
 	dst4 = (struct in_addr *)&dst->sin6_addr.s6_addr[12];
+	dst6 = &dst->sin6_addr;
 
-	if (IN6_IS_ADDR_MULTICAST(&dst6) ||
+	if (IN6_IS_ADDR_MULTICAST(dst6) ||
 	    (af == AF_INET && IN_MULTICAST(dst4->s_addr))) {
 		/*
 		 * Deliver a multicast or broadcast datagram to *all* sockets
@@ -830,10 +919,11 @@ udp6_realinput(int af, struct sockaddr_i
 			if (in6p->in6p_lport != dport)
 				continue;
 			if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_laddr)) {
-				if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_laddr, &dst6))
+				if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_laddr,
+				    dst6))
 					continue;
 			} else {
-				if (IN6_IS_ADDR_V4MAPPED(&dst6) &&
+				if (IN6_IS_ADDR_V4MAPPED(dst6) &&
 				    (in6p->in6p_flags & IN6P_IPV6_V6ONLY))
 					continue;
 			}
@@ -867,11 +957,11 @@ udp6_realinput(int af, struct sockaddr_i
 		/*
 		 * Locate pcb for datagram.
 		 */
-		in6p = in6_pcblookup_connect(&udbtable, &src6, sport,
-		    &dst6, dport, 0);
+		in6p = in6_pcblookup_connect(&udbtable, &src6, sport, dst6,
+		    dport, 0);
 		if (in6p == 0) {
-			++udpstat.udps_pcbhashmiss;
-			in6p = in6_pcblookup_bind(&udbtable, &dst6, dport, 0);
+			UDP_STATINC(UDP_STAT_PCBHASHMISS);
+			in6p = in6_pcblookup_bind(&udbtable, dst6, dport, 0);
 			if (in6p == 0)
 				return rcvcnt;
 		}
@@ -899,7 +989,7 @@ udp_notify(struct inpcb *inp, int errno)
 }
 
 void *
-udp_ctlinput(int cmd, struct sockaddr *sa, void *v)
+udp_ctlinput(int cmd, const struct sockaddr *sa, void *v)
 {
 	struct ip *ip = v;
 	struct udphdr *uh;
@@ -919,29 +1009,25 @@ udp_ctlinput(int cmd, struct sockaddr *s
 	else if (errno == 0)
 		return NULL;
 	if (ip) {
-		uh = (struct udphdr *)((caddr_t)ip + (ip->ip_hl << 2));
-		in_pcbnotify(&udbtable, satosin(sa)->sin_addr, uh->uh_dport,
+		uh = (struct udphdr *)((char *)ip + (ip->ip_hl << 2));
+		in_pcbnotify(&udbtable, satocsin(sa)->sin_addr, uh->uh_dport,
 		    ip->ip_src, uh->uh_sport, errno, notify);
 
 		/* XXX mapped address case */
 	} else
-		in_pcbnotifyall(&udbtable, satosin(sa)->sin_addr, errno,
+		in_pcbnotifyall(&udbtable, satocsin(sa)->sin_addr, errno,
 		    notify);
 	return NULL;
 }
 
 int
-udp_ctloutput(op, so, level, optname, mp)
-	int op;
-	struct socket *so;
-	int level, optname;
-	struct mbuf **mp;
+udp_ctloutput(int op, struct socket *so, struct sockopt *sopt)
 {
 	int s;
 	int error = 0;
-	struct mbuf *m;
 	struct inpcb *inp;
 	int family;
+	int optval;
 
 	family = so->so_proto->pr_domain->dom_family;
 
@@ -949,16 +1035,16 @@ udp_ctloutput(op, so, level, optname, mp
 	switch (family) {
 #ifdef INET
 	case PF_INET:
-		if (level != IPPROTO_UDP) {
-			error = ip_ctloutput(op, so, level, optname, mp);
+		if (sopt->sopt_level != IPPROTO_UDP) {
+			error = ip_ctloutput(op, so, sopt);
 			goto end;
 		}
 		break;
 #endif
 #ifdef INET6
 	case PF_INET6:
-		if (level != IPPROTO_UDP) {
-			error = ip6_ctloutput(op, so, level, optname, mp);
+		if (sopt->sopt_level != IPPROTO_UDP) {
+			error = ip6_ctloutput(op, so, sopt);
 			goto end;
 		}
 		break;
@@ -966,23 +1052,20 @@ udp_ctloutput(op, so, level, optname, mp
 	default:
 		error = EAFNOSUPPORT;
 		goto end;
-		break;
 	}
 
 
 	switch (op) {
 	case PRCO_SETOPT:
-		m = *mp;
 		inp = sotoinpcb(so);
 
-		switch (optname) {
+		switch (sopt->sopt_name) {
 		case UDP_ENCAP:
-			if (m == NULL || m->m_len < sizeof (int)) {
-				error = EINVAL;
-				goto end;
-			}
+			error = sockopt_getint(sopt, &optval);
+			if (error)
+				break;
 
-			switch(*mtod(m, int *)) {
+			switch(optval) {
 #ifdef IPSEC_NAT_T
 			case 0:
 				inp->inp_flags &= ~INP_ESPINUDP_ALL;
@@ -1000,21 +1083,18 @@ udp_ctloutput(op, so, level, optname, mp
 #endif
 			default:
 				error = EINVAL;
-				goto end;
 				break;
 			}
 			break;
 
 		default:
 			error = ENOPROTOOPT;
-			goto end;
 			break;
 		}
 		break;
 
 	default:
 		error = EINVAL;
-		goto end;
 		break;
 	}
 
@@ -1090,7 +1170,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++;
+	UDP_STATINC(UDP_STAT_OPACKETS);
 
 	return (ip_output(m, inp->inp_options, ro,
 	    inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST),
@@ -1108,30 +1188,36 @@ int	udp_recvspace = 40 * (1024 + sizeof(
 /*ARGSUSED*/
 int
 udp_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
-	struct mbuf *control, struct proc *p)
+	struct mbuf *control, struct lwp *l)
 {
 	struct inpcb *inp;
 	int s;
 	int error = 0;
 
 	if (req == PRU_CONTROL)
-		return (in_control(so, (long)m, (caddr_t)nam,
-		    (struct ifnet *)control, p));
+		return (in_control(so, (long)m, (void *)nam,
+		    (struct ifnet *)control, l));
+
+	s = splsoftnet();
 
 	if (req == PRU_PURGEIF) {
+		mutex_enter(softnet_lock);
 		in_pcbpurgeif0(&udbtable, (struct ifnet *)control);
 		in_purgeif((struct ifnet *)control);
 		in_pcbpurgeif(&udbtable, (struct ifnet *)control);
+		mutex_exit(softnet_lock);
+		splx(s);
 		return (0);
 	}
 
-	s = splsoftnet();
 	inp = sotoinpcb(so);
 #ifdef DIAGNOSTIC
 	if (req != PRU_SEND && req != PRU_SENDOOB && control)
 		panic("udp_usrreq: unexpected control mbuf");
 #endif
-	if (inp == 0 && req != PRU_ATTACH) {
+	if (req == PRU_ATTACH) {
+		sosetlock(so);
+	} else if (inp == 0) {
 		error = EINVAL;
 		goto release;
 	}
@@ -1169,7 +1255,7 @@ udp_usrreq(struct socket *so, int req, s
 		break;
 
 	case PRU_BIND:
-		error = in_pcbbind(inp, nam, p);
+		error = in_pcbbind(inp, nam, l);
 		break;
 
 	case PRU_LISTEN:
@@ -1177,7 +1263,7 @@ udp_usrreq(struct socket *so, int req, s
 		break;
 
 	case PRU_CONNECT:
-		error = in_pcbconnect(inp, nam);
+		error = in_pcbconnect(inp, nam, l);
 		if (error)
 			break;
 		soisconnected(so);
@@ -1219,7 +1305,7 @@ udp_usrreq(struct socket *so, int req, s
 				error = EISCONN;
 				goto die;
 			}
-			error = in_pcbconnect(inp, nam);
+			error = in_pcbconnect(inp, nam, l);
 			if (error)
 				goto die;
 		} else {
@@ -1275,10 +1361,18 @@ release:
 	return (error);
 }
 
+static int
+sysctl_net_inet_udp_stats(SYSCTLFN_ARGS)
+{
+
+	return (NETSTAT_SYSCTL(udpstat_percpu, UDP_NSTATS));
+}
+
 /*
  * Sysctl for udp variables.
  */
-SYSCTL_SETUP(sysctl_net_inet_udp_setup, "sysctl net.inet.udp subtree setup")
+static void
+sysctl_net_inet_udp_setup(struct sysctllog **clog)
 {
 
 	sysctl_createv(clog, 0, NULL, NULL,
@@ -1333,24 +1427,37 @@ SYSCTL_SETUP(sysctl_net_inet_udp_setup, 
 		       sysctl_inpcblist, 0, &udbtable, 0,
 		       CTL_NET, PF_INET, IPPROTO_UDP, CTL_CREATE,
 		       CTL_EOL);
+	sysctl_createv(clog, 0, NULL, NULL,
+		       CTLFLAG_PERMANENT,
+		       CTLTYPE_STRUCT, "stats",
+		       SYSCTL_DESCR("UDP statistics"),
+		       sysctl_net_inet_udp_stats, 0, NULL, 0,
+		       CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS,
+		       CTL_EOL);
 }
 #endif
 
+void
+udp_statinc(u_int stat)
+{
+
+	KASSERT(stat < UDP_NSTATS);
+	UDP_STATINC(stat);
+}
+
 #if (defined INET && defined IPSEC_NAT_T)
 /*
  * Returns:
  * 1 if the packet was processed
  * 0 if normal UDP processing should take place
+ * -1 if an error occurent and m was freed
  */
 static int
-udp4_espinudp(m, off, src, so)
-	struct mbuf *m;
-	int off;
-	struct sockaddr *src;
-	struct socket *so;
+udp4_espinudp(struct mbuf **mp, int off, struct sockaddr *src,
+    struct socket *so)
 {
 	size_t len;
-	caddr_t data;
+	void *data;
 	struct inpcb *inp;
 	size_t skip = 0;
 	size_t minlen;
@@ -1360,6 +1467,7 @@ udp4_espinudp(m, off, src, so)
 	struct m_tag *tag;
 	struct udphdr *udphdr;
 	u_int16_t sport, dport;
+	struct mbuf *m = *mp;
 
 	/*
 	 * Collapse the mbuf chain if the first mbuf is too short
@@ -1370,18 +1478,19 @@ udp4_espinudp(m, off, src, so)
 		minlen = m->m_pkthdr.len;
 
 	if (m->m_len < minlen) {
-		if ((m = m_pullup(m, minlen)) == NULL) {
+		if ((*mp = m_pullup(m, minlen)) == NULL) {
 			printf("udp4_espinudp: m_pullup failed\n");
-			return 0;
+			return -1;
 		}
+		m = *mp;
 	}
 
 	len = m->m_len - off;
-	data = mtod(m, caddr_t) + off;
+	data = mtod(m, char *) + off;
 	inp = sotoinpcb(so);
 
 	/* Ignore keepalive packets */
-	if ((len == 1) && (data[0] == '\xff')) {
+	if ((len == 1) && (*(unsigned char *)data == 0xff)) {
 		return 1;
 	}
 
@@ -1400,10 +1509,10 @@ udp4_espinudp(m, off, src, so)
 	}
 
 	if (inp->inp_flags & INP_ESPINUDP_NON_IKE) {
-		u_int64_t *st = (u_int64_t *)data;
+		u_int32_t *st = (u_int32_t *)data;
 
 		if ((len <= sizeof(u_int64_t) + sizeof(struct esp))
-		    || (*st != 0))
+		    || ((st[0] | st[1]) != 0))
 			return 0; /* Normal UDP processing */
 
 		skip = sizeof(struct udphdr) + sizeof(u_int64_t);
@@ -1413,7 +1522,7 @@ udp4_espinudp(m, off, src, so)
 	 * Get the UDP ports. They are handled in network 
 	 * order everywhere in IPSEC_NAT_T code.
 	 */
-	udphdr = (struct udphdr *)(data - skip);
+	udphdr = (struct udphdr *)((char *)data - skip);
 	sport = udphdr->uh_sport;
 	dport = udphdr->uh_dport;
 
@@ -1433,7 +1542,7 @@ udp4_espinudp(m, off, src, so)
 	 *   <-skip->
 	 */
 	iphdrlen = off - sizeof(struct udphdr);
-	memmove(mtod(m, caddr_t) + skip, mtod(m, caddr_t), iphdrlen);
+	memmove(mtod(m, char *) + skip, mtod(m, void *), iphdrlen);
 	m_adj(m, skip);
 
 	ip = mtod(m, struct ip *);
@@ -1466,7 +1575,11 @@ udp4_espinudp(m, off, src, so)
 	((u_int16_t *)(tag + 1))[1] = dport;
 	m_tag_prepend(n, tag);
 
+#ifdef FAST_IPSEC
+	ipsec4_common_input(n, iphdrlen, IPPROTO_ESP);
+#else
 	esp4_input(n, iphdrlen);
+#endif
 
 	/* We handled it, it shoudln't be handled by UDP */
 	return 1;