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.6
retrieving revision 1.143
diff -u -p -r1.134.2.6 -r1.143
--- src/sys/netinet/udp_usrreq.c	2005/12/29 16:10:18	1.134.2.6
+++ src/sys/netinet/udp_usrreq.c	2005/11/15 18:39:46	1.143
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp_usrreq.c,v 1.134.2.6 2005/12/29 16:10:18 riz Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.143 2005/11/15 18:39:46 dsl 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.134.2.6 2005/12/29 16:10:18 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.143 2005/11/15 18:39:46 dsl Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -146,19 +146,20 @@ int	udpcksum = 1;
 #else
 int	udpcksum = 0;		/* XXX */
 #endif
+int	udp_do_loopback_cksum = 0;
 
 struct	inpcbtable udbtable;
 struct	udpstat udpstat;
 
 #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
@@ -186,6 +187,7 @@ struct mowner udp_tx_mowner = { "udp", "
 #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 +197,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
 
@@ -382,10 +401,7 @@ udp_input(struct mbuf *m, ...)
 	bcopy(&ip->ip_dst, &dst.sin_addr, sizeof(dst.sin_addr));
 	dst.sin_port = uh->uh_dport;
 
-	if ((n = udp4_realinput(&src, &dst, &m, iphlen)) == -1) {
-		udpstat.udps_hdrops++;
-		return;
-	}
+	n = udp4_realinput(&src, &dst, m, iphlen);
 #ifdef INET6
 	if (IN_MULTICAST(ip->ip_dst.s_addr) || n == 0) {
 		struct sockaddr_in6 src6, dst6;
@@ -445,6 +461,11 @@ 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;
 	}
@@ -452,9 +473,34 @@ udp6_input_checksum(struct mbuf *m, cons
 		udp6stat.udp6s_nosum++;
 		goto bad;
 	}
-	if (in6_cksum(m, IPPROTO_UDP, off, len) != 0) {
+
+	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);
 		udp6stat.udp6s_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) {
+			udp6stat.udp6s_badsum++;
+			goto bad;
+		}
 	}
 
 good:
@@ -662,14 +708,13 @@ udp6_sendup(struct mbuf *m, int off /* o
 #ifdef INET
 static int
 udp4_realinput(struct sockaddr_in *src, struct sockaddr_in *dst,
-	struct mbuf **mp, int off /* offset of udphdr */)
+	struct mbuf *m, 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 */
@@ -757,26 +802,12 @@ udp4_realinput(struct sockaddr_in *src, 
 		if (inp->inp_flags & INP_ESPINUDP_ALL) {
 			struct sockaddr *sa = (struct sockaddr *)src;
 
-			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 */
+			if (udp4_espinudp(m, off, sa, inp->inp_socket) != 0) {
 				rcvcnt++;
 				goto bad;
-				break;
-
-			case 0: 	/* plain UDP */
-			default: 	/* Unexpected */
-				/* 
-				 * Normal UDP processing will take place 
-				 * m may have changed.
-				 */
-				m = *mp;
-				break;
 			}
+
+			/* Normal UDP processing will take place */
 		}
 #endif
 
@@ -1195,7 +1226,7 @@ udp_usrreq(struct socket *so, int req, s
 		break;
 
 	case PRU_CONNECT:
-		error = in_pcbconnect(inp, nam);
+		error = in_pcbconnect(inp, nam, p);
 		if (error)
 			break;
 		soisconnected(so);
@@ -1237,7 +1268,7 @@ udp_usrreq(struct socket *so, int req, s
 				error = EISCONN;
 				goto die;
 			}
-			error = in_pcbconnect(inp, nam);
+			error = in_pcbconnect(inp, nam, p);
 			if (error)
 				goto die;
 		} else {
@@ -1351,6 +1382,13 @@ 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"),
+		       NULL, 0, &udpstat, sizeof(udpstat),
+		       CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS,
+		       CTL_EOL);
 }
 #endif
 
@@ -1359,11 +1397,10 @@ SYSCTL_SETUP(sysctl_net_inet_udp_setup, 
  * 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(mp, off, src, so)
-	struct mbuf **mp;
+udp4_espinudp(m, off, src, so)
+	struct mbuf *m;
 	int off;
 	struct sockaddr *src;
 	struct socket *so;
@@ -1379,7 +1416,6 @@ udp4_espinudp(mp, 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
@@ -1390,11 +1426,10 @@ udp4_espinudp(mp, off, src, so)
 		minlen = m->m_pkthdr.len;
 
 	if (m->m_len < minlen) {
-		if ((*mp = m_pullup(m, minlen)) == NULL) {
+		if ((m = m_pullup(m, minlen)) == NULL) {
 			printf("udp4_espinudp: m_pullup failed\n");
-			return -1;
+			return 0;
 		}
-		m = *mp;
 	}
 
 	len = m->m_len - off;