 @@ -1,14 +1,14 @@
-/*	$NetBSD: in6_pcb.c,v 1.115 2011/08/31 18:31:03 plunky Exp $	*/
+/*	$NetBSD: in6_pcb.c,v 1.116 2011/09/24 17:22:14 christos Exp $	*/
 /*	$KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -52,27 +52,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)in_pcb.c	8.2 (Berkeley) 1/4/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.115 2011/08/31 18:31:03 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.116 2011/09/24 17:22:14 christos Exp $");
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 @@ -81,26 +81,27 @@ __KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v
 #include <sys/kauth.h>
 #include <sys/domain.h>
 #include <sys/once.h>
 #include <net/if.h>
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip6.h>
 #include <netinet/rfc6056.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/in6_pcb.h>
 #include <netinet6/scope6_var.h>
 #include <netinet6/nd6.h>
 #include "faith.h"
 #ifdef IPSEC
 #include <netinet6/ipsec.h>
 #include <netkey/key.h>
 #endif /* IPSEC */
 #ifdef FAST_IPSEC
 @@ -166,26 +167,28 @@ in6_pcballoc(struct socket *so, void *v)
 #endif
 	s = splnet();
 	in6p = pool_get(&in6pcb_pool, PR_NOWAIT);
 	splx(s);
 	if (in6p == NULL)
 		return (ENOBUFS);
 	memset((void *)in6p, 0, sizeof(*in6p));
 	in6p->in6p_af = AF_INET6;
 	in6p->in6p_table = table;
 	in6p->in6p_socket = so;
 	in6p->in6p_hops = -1;	/* use kernel default */
 	in6p->in6p_icmp6filt = NULL;
 	in6p->in6p_rfc6056algo = RFC6056_ALGO_DEFAULT;
 	in6p->in6p_bindportonsend = false;
 #if defined(IPSEC) || defined(FAST_IPSEC)
 	error = ipsec_init_pcbpolicy(so, &in6p->in6p_sp);
 	if (error != 0) {
 		s = splnet();
 		pool_put(&in6pcb_pool, in6p);
 		splx(s);
 		return error;
+	}
 #endif /* IPSEC */
 	s = splnet();
 	CIRCLEQ_INSERT_HEAD(&table->inpt_queue, (struct inpcb_hdr*)in6p,
 	    inph_queue);
 	LIST_INSERT_HEAD(IN6PCBHASH_PORT(table, in6p->in6p_lport),
 @@ -537,26 +540,38 @@ in6_pcbconnect(void *v, struct mbuf *nam
 	if (IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_laddr) ||
 	    (IN6_IS_ADDR_V4MAPPED(&in6p->in6p_laddr) &&
 	     in6p->in6p_laddr.s6_addr32[3] == 0))
+	{
 		if (in6p->in6p_lport == 0) {
 			error = in6_pcbbind(in6p, (struct mbuf *)0, l);
 			if (error != 0)
 				return error;
+		}
 		in6p->in6p_laddr = *in6a;
+	}
 	in6p->in6p_faddr = sin6->sin6_addr;
 	in6p->in6p_fport = sin6->sin6_port;
         /* Late bind, if needed */
 	if (in6p->in6p_bindportonsend) {
                struct sockaddr_in6 lsin = *((const struct sockaddr_in6 *)
 		    in6p->in6p_socket->so_proto->pr_domain->dom_sa_any);
 		lsin.sin6_addr = in6p->in6p_laddr;
 		lsin.sin6_port = 0;
                if ((error = in6_pcbbind_port(in6p, &lsin, l)) != 0)
                        return error;
+	}
 	in6_pcbstate(in6p, IN6P_CONNECTED);
 	in6p->in6p_flowinfo &= ~IPV6_FLOWLABEL_MASK;
 	if (ip6_auto_flowlabel)
 		in6p->in6p_flowinfo |=
 		    (htonl(ip6_randomflowlabel()) & IPV6_FLOWLABEL_MASK);
 #if defined(IPSEC) || defined(FAST_IPSEC)
 	if (in6p->in6p_socket->so_type == SOCK_STREAM)
 		ipsec_pcbconn(in6p->in6p_sp);
 #endif
 	return (0);
+}
 void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: in6_pcb.h,v 1.35 2011/05/03 18:28:45 dyoung Exp $	*/
+/*	$NetBSD: in6_pcb.h,v 1.36 2011/09/24 17:22:14 christos Exp $	*/
 /*	$KAME: in6_pcb.h,v 1.45 2001/02/09 05:59:46 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -68,46 +68,48 @@
 #include <netinet/in_pcb_hdr.h>
 /*
  * Common structure pcb for internet protocol implementation.
  * Here are stored pointers to local and foreign host table
  * entries, local and foreign socket numbers, and pointers
  * up (to a socket structure) and down (to a protocol-specific)
  * control block.
  */
 struct icmp6_filter;
 struct	in6pcb {
 	struct inpcb_hdr in6p_head;
-#define in6p_hash	in6p_head.inph_hash
+#define in6p_hash	 in6p_head.inph_hash
-#define in6p_queue	in6p_head.inph_queue
+#define in6p_queue	 in6p_head.inph_queue
-#define in6p_af		in6p_head.inph_af
+#define in6p_af		 in6p_head.inph_af
-#define in6p_ppcb	in6p_head.inph_ppcb
+#define in6p_ppcb	 in6p_head.inph_ppcb
-#define in6p_state	in6p_head.inph_state
+#define in6p_state	 in6p_head.inph_state
-#define in6p_socket	in6p_head.inph_socket
+#define in6p_rfc6056algo in6p_head.inph_rfc6056algo
-#define in6p_table	in6p_head.inph_table
+#define in6p_socket	 in6p_head.inph_socket
-#define in6p_sp		in6p_head.inph_sp
+#define in6p_table	 in6p_head.inph_table
 #define in6p_sp		 in6p_head.inph_sp
 	struct	route in6p_route;	/* placeholder for routing entry */
 	u_int16_t in6p_fport;		/* foreign port */
 	u_int16_t in6p_lport;		/* local port */
 	u_int32_t in6p_flowinfo;	/* priority and flowlabel */
 	int	in6p_flags;		/* generic IP6/datagram flags */
 	int	in6p_hops;		/* default hop limit */
 	struct	ip6_hdr in6p_ip6;	/* header prototype */
 	struct	mbuf *in6p_options;   /* IP6 options */
 	struct	ip6_pktopts *in6p_outputopts; /* IP6 options for outgoing packets */
 	struct	ip6_moptions *in6p_moptions; /* IP6 multicast options */
 	struct icmp6_filter *in6p_icmp6filt;
 	int	in6p_cksum;		/* IPV6_CHECKSUM setsockopt */
 	bool    in6p_bindportonsend;
 };
 #define in6p_faddr	in6p_ip6.ip6_dst
 #define in6p_laddr	in6p_ip6.ip6_src
 /* states in inp_state: */
 #define	IN6P_ATTACHED		INP_ATTACHED
 #define	IN6P_BOUND		INP_BOUND
 #define	IN6P_CONNECTED		INP_CONNECTED
 /*
  * Flags in in6p_flags
  * We define KAME's original flags in higher 16 bits as much as possible

 @@ -1,14 +1,14 @@
-/*	$NetBSD: in6_proto.c,v 1.92 2011/05/24 18:07:11 spz Exp $	*/
+/*	$NetBSD: in6_proto.c,v 1.93 2011/09/24 17:22:14 christos Exp $	*/
 /*	$KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -52,27 +52,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)in_proto.c	8.1 (Berkeley) 6/10/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.92 2011/05/24 18:07:11 spz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.93 2011/09/24 17:22:14 christos Exp $");
 #include "opt_gateway.h"
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_iso.h"
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/protosw.h>
 #include <sys/kernel.h>
 #include <sys/domain.h>
 #include <sys/mbuf.h>
 @@ -158,33 +158,33 @@ PR_WRAP_USRREQ(tcp_usrreq)
 #define	tcp_usrreq 	tcp_usrreq_wrapper
 PR_WRAP_CTLINPUT(rip6_ctlinput)
 PR_WRAP_CTLINPUT(encap6_ctlinput)
 PR_WRAP_CTLINPUT(udp6_ctlinput)
 PR_WRAP_CTLINPUT(tcp6_ctlinput)
 #define	rip6_ctlinput	rip6_ctlinput_wrapper
 #define	encap6_ctlinput	encap6_ctlinput_wrapper
 #define	udp6_ctlinput	udp6_ctlinput_wrapper
 #define	tcp6_ctlinput	tcp6_ctlinput_wrapper
 PR_WRAP_CTLOUTPUT(rip6_ctloutput)
 PR_WRAP_CTLOUTPUT(ip6_ctloutput)
 PR_WRAP_CTLOUTPUT(tcp_ctloutput)
 PR_WRAP_CTLOUTPUT(udp6_ctloutput)
 PR_WRAP_CTLOUTPUT(icmp6_ctloutput)
 #define	rip6_ctloutput	rip6_ctloutput_wrapper
 #define	ip6_ctloutput	ip6_ctloutput_wrapper
 #define	tcp_ctloutput	tcp_ctloutput_wrapper
 #define	udp6_ctloutput	udp6_ctloutput_wrapper
 #define	icmp6_ctloutput	icmp6_ctloutput_wrapper
 #if defined(IPSEC) || defined(FAST_IPSEC)
 PR_WRAP_CTLINPUT(ah6_ctlinput)
 #define	ah6_ctlinput	ah6_ctlinput_wrapper
 #endif
 #if (defined(IPSEC) && defined(IPSEC_ESP)) || defined(FAST_IPSEC)
 PR_WRAP_CTLINPUT(esp6_ctlinput)
 #define	esp6_ctlinput	esp6_ctlinput_wrapper
 #endif
 @@ -193,27 +193,27 @@ const struct ip6protosw inet6sw[] = {
 {	.pr_domain = &inet6domain,
 	.pr_protocol = IPPROTO_IPV6,
 	.pr_init = ip6_init,
 	.pr_fasttimo = frag6_fasttimo,
 	.pr_slowtimo = frag6_slowtimo,
 	.pr_drain = frag6_drainstub,
 },
 {	.pr_type = SOCK_DGRAM,
 	.pr_domain = &inet6domain,
 	.pr_protocol = IPPROTO_UDP,
 	.pr_flags = PR_ATOMIC|PR_ADDR|PR_PURGEIF,
 	.pr_input = udp6_input,
 	.pr_ctlinput = udp6_ctlinput,
-	.pr_ctloutput = ip6_ctloutput,
+	.pr_ctloutput = udp6_ctloutput,
 	.pr_usrreq = udp6_usrreq,
 	.pr_init = udp6_init,
 },
 {	.pr_type = SOCK_STREAM,
 	.pr_domain = &inet6domain,
 	.pr_protocol = IPPROTO_TCP,
 	.pr_flags = PR_CONNREQUIRED|PR_WANTRCVD|PR_LISTEN|PR_ABRTACPTDIS|PR_PURGEIF,
 	.pr_input = tcp6_input,
 	.pr_ctlinput = tcp6_ctlinput,
 	.pr_ctloutput = tcp_ctloutput,
 	.pr_usrreq = tcp_usrreq,
 #ifndef INET	/* don't call initialization and timeout routines twice */
 	.pr_init = tcp_init,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: in6_src.c,v 1.51 2011/05/17 04:39:57 dholland Exp $	*/
+/*	$NetBSD: in6_src.c,v 1.52 2011/09/24 17:22:14 christos Exp $	*/
 /*	$KAME: in6_src.c,v 1.159 2005/10/19 01:40:32 t-momose Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -56,53 +56,54 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)in_pcb.c	8.2 (Berkeley) 1/4/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.51 2011/05/17 04:39:57 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.52 2011/09/24 17:22:14 christos Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/kauth.h>
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/rfc6056.h>
 #include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
 #include <netinet6/in6_pcb.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/ip6_private.h>
 #include <netinet6/nd6.h>
 #include <netinet6/scope6_var.h>
 #include <net/net_osdep.h>
 #ifdef MIP6
 #include <netinet6/mip6.h>
 #include <netinet6/mip6_var.h>
 @@ -791,110 +792,56 @@ in6_selecthlim(struct in6pcb *in6p, stru
 		return (ND_IFINFO(ifp)->chlim);
 	else
 		return (ip6_defhlim);
+}
 /*
  * Find an empty port and set it to the specified PCB.
  */
 int
 in6_pcbsetport(struct sockaddr_in6 *sin6, struct in6pcb *in6p, struct lwp *l)
+{
 	struct socket *so = in6p->in6p_socket;
 	struct inpcbtable *table = in6p->in6p_table;
 	int cnt;
 	u_int16_t minport, maxport;
 	u_int16_t lport, *lastport;
 	int wild = 0;
 	void *t;
 	int error;
 	enum kauth_network_req req;
 	int error = 0;
 	/* XXX: this is redundant when called from in6_pcbbind */
 	if ((so->so_options & (SO_REUSEADDR|SO_REUSEPORT)) == 0 &&
 	   ((so->so_proto->pr_flags & PR_CONNREQUIRED) == 0 ||
 	    (so->so_options & SO_ACCEPTCONN) == 0))
 		wild = 1;
 	if (in6p->in6p_flags & IN6P_LOWPORT) {
 #ifndef IPNOPRIVPORTS
 		req = KAUTH_REQ_NETWORK_BIND_PRIVPORT;
 #else
 		req = KAUTH_REQ_NETWORK_BIND_PORT;
 #endif
 		minport = ip6_lowportmin;
 		maxport = ip6_lowportmax;
 		lastport = &table->inpt_lastlow;
 	} else {
 		req = KAUTH_REQ_NETWORK_BIND_PORT;
 		minport = ip6_anonportmin;
 		maxport = ip6_anonportmax;
 		lastport = &table->inpt_lastport;
+	}
 	/* XXX-kauth: KAUTH_REQ_NETWORK_BIND_AUTOASSIGN_{,PRIV}PORT */
 	error = kauth_authorize_network(l->l_cred, KAUTH_NETWORK_BIND, req, so,
 	    sin6, NULL);
 	if (error)
 		return (EACCES);
-	if (minport > maxport) {	/* sanity check */
+       /*
-		u_int16_t swp;
+        * Use RFC6056 randomized port selection
         */
-		swp = minport;
+	error = rfc6056_randport(&lport, &in6p->in6p_head, l->l_cred);
-		minport = maxport;
+	if (error)
-		maxport = swp;
+		return error;
 	lport = *lastport - 1;
 	for (cnt = maxport - minport + 1; cnt; cnt--, lport--) {
 		vestigial_inpcb_t vestige;
 		if (lport < minport || lport > maxport)
 			lport = maxport;
 #ifdef INET
 		if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
 			t = in_pcblookup_port(table,
 			    *(struct in_addr *)&sin6->sin6_addr.s6_addr32[3],
 			    htons(lport), wild, &vestige);
 			if (!t && vestige.valid)
 				continue;
 		} else
 #endif
 			t = in6_pcblookup_port(table, &sin6->sin6_addr,
 			    htons(lport), wild, &vestige);
 			if (!t && vestige.valid)
 				continue;
 		if (t == 0) {
 			/* We have a free port. Check with the secmodel. */
 			sin6->sin6_port = lport;
 			error = kauth_authorize_network(l->l_cred,
 			    KAUTH_NETWORK_BIND, req, so, sin6, NULL);
 			if (error) {
 				/* Secmodel says no. Keep looking. */
 				continue;
 			goto found;
 	return (EAGAIN);
 found:
 	in6p->in6p_flags |= IN6P_ANONPORT;
 	*lastport = lport;
 	in6p->in6p_lport = htons(lport);
 	in6_pcbstate(in6p, IN6P_BOUND);
 	return (0);		/* success */
+}
 void
 addrsel_policy_init(void)
+{
 	init_policy_queue();
 	/* initialize the "last resort" policy */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: udp6_output.c,v 1.42 2011/08/31 18:31:03 plunky Exp $	*/
+/*	$NetBSD: udp6_output.c,v 1.43 2011/09/24 17:22:14 christos Exp $	*/
 /*	$KAME: udp6_output.c,v 1.43 2001/10/15 09:19:52 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -52,27 +52,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_output.c,v 1.42 2011/08/31 18:31:03 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_output.c,v 1.43 2011/09/24 17:22:14 christos Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/errno.h>
 #include <sys/stat.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 @@ -172,30 +172,29 @@ udp6_output(struct in6pcb * const in6p,
 		    in6p->in6p_outputopts, l->l_cred, IPPROTO_UDP)) != 0)
 			goto release;
 		optp = &opt;
 	} else
 		optp = in6p->in6p_outputopts;
 	if (sin6) {
 		faddr = &sin6->sin6_addr;
 		/*
 		 * IPv4 version of udp_output calls in_pcbconnect in this case,
 		 * which needs splnet and affects performance.
-		 * Since we saw no essential reason for calling in_pcbconnect,
+		 * We have to do this as well, since in6_pcbsetport needs to
-		 * we get rid of such kind of logic, and call in6_selectsrc
+		 * know the foreign address for some of the algorithms that
-		 * and in6_pcbsetport in order to fill in the local address
+		 * it employs.
 		 * and the local port.
 		 */
 		if (sin6->sin6_port == 0) {
 			error = EADDRNOTAVAIL;
 			goto release;
+		}
 		if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_faddr)) {
 			/* how about ::ffff:0.0.0.0 case? */
 			error = EISCONN;
 			goto release;
+		}
 @@ -282,27 +281,29 @@ udp6_output(struct in6pcb * const in6p,
+		}
 		if (in6p->in6p_lport == 0) {
 			/*
 			 * Craft a sockaddr_in6 for the local endpoint. Use the
 			 * "any" as a base, set the address, and recover the
 			 * scope.
 			 */
 			struct sockaddr_in6 lsin6 =
 			    *((const struct sockaddr_in6 *)in6p->in6p_socket->so_proto->pr_domain->dom_sa_any);
 			lsin6.sin6_addr = *laddr;
 			error = sa6_recoverscope(&lsin6);
 			if (error)
 				goto release;
 			error = in6_pcbsetport(&lsin6, in6p, l);
 			error = in6_pcbconnect(in6p, addr6, l);
 			if (error)
 				goto release;
+		}
 	} else {
 		if (IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_faddr)) {
 			error = ENOTCONN;
 			goto release;
+		}
 		if (IN6_IS_ADDR_V4MAPPED(&in6p->in6p_faddr)) {
 			if ((in6p->in6p_flags & IN6P_IPV6_V6ONLY))
+			{
 				/*
 				 * XXX: this case would happen when the

 @@ -1,14 +1,14 @@
-/*	$NetBSD: udp6_usrreq.c,v 1.89 2011/05/03 18:28:45 dyoung Exp $	*/
+/*	$NetBSD: udp6_usrreq.c,v 1.90 2011/09/24 17:22:14 christos Exp $	*/
 /*	$KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -52,53 +52,57 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.89 2011/05/03 18:28:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.90 2011/09/24 17:22:14 christos Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/errno.h>
 #include <sys/stat.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/syslog.h>
 #include <sys/domain.h>
 #include <sys/sysctl.h>
 #include <net/if.h>
 #include <net/route.h>
 #include <net/if_types.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/in_pcb.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/rfc6056.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/in6_pcb.h>
 #include <netinet/icmp6.h>
 #include <netinet6/udp6_var.h>
 #include <netinet6/udp6_private.h>
 #include <netinet6/ip6protosw.h>
 #include <netinet/in_offload.h>
 #include "faith.h"
 #if defined(NFAITH) && NFAITH > 0
 #include <net/if_faith.h>
 #endif
 @@ -244,26 +248,91 @@ udp6_ctlinput(int cmd, const struct sock
 			 */
+		}
 		(void) in6_pcbnotify(&udbtable, sa, uh.uh_dport,
 		    (const struct sockaddr *)sa6_src, uh.uh_sport, cmd, cmdarg,
 		    notify);
 	} else {
 		(void) in6_pcbnotify(&udbtable, sa, 0,
 		    (const struct sockaddr *)sa6_src, 0, cmd, cmdarg, notify);
+	}
 	return NULL;
+}
 int
 udp6_ctloutput(int op, struct socket *so, struct sockopt *sopt)
+{
 	int s;
 	int error = 0;
 	struct inpcb *inp;
 	int family;
 	int optval;
 	family = so->so_proto->pr_domain->dom_family;
 	s = splsoftnet();
 	switch (family) {
 #ifdef INET
 	case PF_INET:
 		if (sopt->sopt_level != IPPROTO_UDP) {
 			error = ip_ctloutput(op, so, sopt);
 			goto end;
+		}
 		break;
 #endif
 #ifdef INET6
 	case PF_INET6:
 		if (sopt->sopt_level != IPPROTO_UDP) {
 			error = ip6_ctloutput(op, so, sopt);
 			goto end;
+		}
 		break;
 #endif
 	default:
 		error = EAFNOSUPPORT;
 		goto end;
+	}
 	switch (op) {
 	case PRCO_SETOPT:
 		inp = sotoinpcb(so);
 		switch (sopt->sopt_name) {
 		case UDP_RFC6056ALGO:
 			error = sockopt_getint(sopt, &optval);
 			if (error)
 				break;
 			error = rfc6056_algo_index_select(
 			    (struct inpcb_hdr *)inp, optval);
 			break;
 		default:
 			error = ENOPROTOOPT;
 			break;
+		}
 		break;
 	default:
 		error = EINVAL;
 		break;
+	}
 end:
 	splx(s);
 	return error;
+}
 extern	int udp6_sendspace;
 extern	int udp6_recvspace;
 int
 udp6_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *addr6,
     struct mbuf *control, struct lwp *l)
+{
 	struct	in6pcb *in6p = sotoin6pcb(so);
 	int	error = 0;
 	int	s;
 	/*
 	 * MAPPED_ADDR implementation info:
 @@ -409,26 +478,28 @@ release:
 	return error;
+}
 static int
 sysctl_net_inet6_udp6_stats(SYSCTLFN_ARGS)
+{
 	return (NETSTAT_SYSCTL(udp6stat_percpu, UDP6_NSTATS));
+}
 static void
 sysctl_net_inet6_udp6_setup(struct sysctllog **clog)
+{
 	const struct sysctlnode *rfc6056_node;
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "net", NULL,
 		       NULL, 0, NULL, 0,
 		       CTL_NET, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "inet6", NULL,
 		       NULL, 0, NULL, 0,
 		       CTL_NET, PF_INET6, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "udp6",
 @@ -461,22 +532,41 @@ sysctl_net_inet6_udp6_setup(struct sysct
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_STRUCT, "pcblist",
 		       SYSCTL_DESCR("UDP protocol control block list"),
 		       sysctl_inpcblist, 0, &udbtable, 0,
 		       CTL_NET, PF_INET6, IPPROTO_UDP, CTL_CREATE,
 		       CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_STRUCT, "stats",
 		       SYSCTL_DESCR("UDPv6 statistics"),
 		       sysctl_net_inet6_udp6_stats, 0, NULL, 0,
 		       CTL_NET, PF_INET6, IPPROTO_UDP, UDP6CTL_STATS,
 		       CTL_EOL);
 	/* RFC6056 subtree */
 	sysctl_createv(clog, 0, NULL, &rfc6056_node,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "rfc6056",
 		       SYSCTL_DESCR("RFC 6056"),
 	    	       NULL, 0, NULL, 0,
 		       CTL_NET, PF_INET6, IPPROTO_UDP, CTL_CREATE, CTL_EOL);
 	sysctl_createv(clog, 0, &rfc6056_node, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_STRING, "available",
 		       SYSCTL_DESCR("RFC 6056 available algorithms"),
 		       sysctl_rfc6056_available, 0, NULL, RFC6056_MAXLEN,
 		       CTL_CREATE, CTL_EOL);
 	sysctl_createv(clog, 0, &rfc6056_node, NULL,
 		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
 		       CTLTYPE_STRING, "selected",
 		       SYSCTL_DESCR("RFC 6056 selected algorithm"),
 	               sysctl_rfc6056_selected6, 0, NULL, RFC6056_MAXLEN,
 		       CTL_CREATE, CTL_EOL);
+}
 void
 udp6_statinc(u_int stat)
+{
 	KASSERT(stat < UDP6_NSTATS);
 	UDP6_STATINC(stat);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: udp6_var.h,v 1.23 2008/04/24 11:38:38 ad Exp $	*/
+/*	$NetBSD: udp6_var.h,v 1.24 2011/09/24 17:22:14 christos Exp $	*/
 /*	$KAME: udp6_var.h,v 1.11 2000/06/05 00:14:31 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -74,42 +74,43 @@
 #define	UDP6_STAT_NOSUM		3	/* no checksum */
 #define	UDP6_STAT_BADLEN	4	/* data length larger than packet */
 #define	UDP6_STAT_NOPORT	5	/* no socket on port */
 #define	UDP6_STAT_NOPORTMCAST	6	/* of above, arrived as multicast */
 #define	UDP6_STAT_FULLSOCK	7	/* not delivered, input socket full */
 #define	UDP6_STAT_PCBCACHEMISS	8	/* input packets missing pcb cache */
 #define	UDP6_STAT_OPACKETS	9	/* total output packets */
 #define	UDP6_NSTATS		10
 /*
  * Names for UDP6 sysctl objects
  */
-#define UDP6CTL_SENDSPACE	1	/* default send buffer */
+#define	UDP6CTL_SENDSPACE	1	/* default send buffer */
-#define UDP6CTL_RECVSPACE	2	/* default recv buffer */
+#define	UDP6CTL_RECVSPACE	2	/* default recv buffer */
 #define	UDP6CTL_LOOPBACKCKSUM	3	/* do UDP checksum on loopback? */
-#define UDP6CTL_STATS		4	/* udp6 statistics */
+#define	UDP6CTL_STATS		4	/* udp6 statistics */
-#define UDP6CTL_MAXID		5
+#define	UDP6CTL_RFC6056		5	/* RFC 6056 algorithm selection */
 #define	UDP6CTL_MAXID		6
 #define UDP6CTL_NAMES { \
 	{ 0, 0 }, \
 	{ "sendspace", CTLTYPE_INT }, \
 	{ "recvspace", CTLTYPE_INT }, \
 	{ "do_loopback_cksum", CTLTYPE_INT }, \
 	{ "stats", CTLTYPE_STRUCT }, \
+}
 #ifdef _KERNEL
 void	*udp6_ctlinput(int, const struct sockaddr *, void *);
 int	udp6_ctloutput(int, struct socket *, struct sockopt *);
 void	udp6_init(void);
 int	udp6_input(struct mbuf **, int *, int);
 int	udp6_output(struct in6pcb *, struct mbuf *, struct mbuf *,
-	struct mbuf *, struct lwp *);
+    struct mbuf *, struct lwp *);
 int	udp6_sysctl(int *, u_int, void *, size_t *, void *, size_t);
-int	udp6_usrreq(struct socket *,
+int	udp6_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
-			 int, struct mbuf *, struct mbuf *, struct mbuf *,
+    struct mbuf *, struct lwp *);
 			 struct lwp *);
 void	udp6_statinc(u_int);
 #endif /* _KERNEL */
 #endif /* !_NETINET6_UDP6_VAR_H_ */