 @@ -1,14 +1,14 @@
-/*	$NetBSD: in_pcb.c,v 1.160 2015/05/02 17:18:03 rtr Exp $	*/
+/*	$NetBSD: in_pcb.c,v 1.161 2015/05/24 15:43:45 rtr 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
  *    documentation and/or other materials provided with the distribution.
 @@ -83,27 +83,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.4 (Berkeley) 5/24/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.160 2015/05/02 17:18:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.161 2015/05/24 15:43:45 rtr Exp $");
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include <sys/param.h>
 #include <sys/systm.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>
 @@ -433,41 +433,26 @@ in_pcbbind(void *v, struct sockaddr_in *
 	/* Bind port. */
 	error = in_pcbbind_port(inp, sin, l->l_cred);
 	if (error) {
 		inp->inp_laddr.s_addr = INADDR_ANY;
 		return (error);
+	}
 	return (0);
+}
 /*
  * adapter function that accepts nam as mbuf for in_pcbconnect()
  */
 int
 in_pcbconnect_m(void *v, struct mbuf *nam, struct lwp *l)
 	struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
 	if (sizeof (*sin) != nam->m_len) {
 		return EINVAL;
 	return in_pcbconnect(v, sin, l);
 /*
  * Connect from a socket to a specified address.
  * Both address and port must be specified in argument sin.
  * If don't have a local address for this socket yet,
  * then pick one.
  */
 int
 in_pcbconnect(void *v, struct sockaddr_in *sin, struct lwp *l)
+{
 	struct inpcb *inp = v;
 	struct in_ifaddr *ia = NULL;
 	struct sockaddr_in *ifaddr = NULL;
 	vestigial_inpcb_t vestige;
 	int error;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: in_pcb.h,v 1.58 2015/05/02 17:18:03 rtr Exp $	*/
+/*	$NetBSD: in_pcb.h,v 1.59 2015/05/24 15:43:45 rtr 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
  *    documentation and/or other materials provided with the distribution.
 @@ -123,27 +123,26 @@ struct inpcb {
 #define	INP_PKTINFO		0x1000	/* receive dst packet info */
 #define	INP_RECVPKTINFO		0x2000	/* receive dst packet info */
 #define	INP_CONTROLOPTS		(INP_RECVOPTS|INP_RECVRETOPTS|INP_RECVDSTADDR|\
 				INP_RECVIF|INP_RECVTTL|INP_RECVPKTINFO|\
 				INP_PKTINFO)
 #define	sotoinpcb(so)		((struct inpcb *)(so)->so_pcb)
 #ifdef _KERNEL
 void	in_losing(struct inpcb *);
 int	in_pcballoc(struct socket *, void *);
 int	in_pcbbind(void *, struct sockaddr_in *, struct lwp *);
 int	in_pcbconnect(void *, struct sockaddr_in *, struct lwp *);
 int	in_pcbconnect_m(void *, struct mbuf *, struct lwp *);
 void	in_pcbdetach(void *);
 void	in_pcbdisconnect(void *);
 void	in_pcbinit(struct inpcbtable *, int, int);
 struct inpcb *
 	in_pcblookup_port(struct inpcbtable *,
 			  struct in_addr, u_int, int, struct vestigial_inpcb *);
 struct inpcb *
 	in_pcblookup_bind(struct inpcbtable *,
 	    struct in_addr, u_int);
 struct inpcb *
 	in_pcblookup_connect(struct inpcbtable *,
 			     struct in_addr, u_int, struct in_addr, u_int,
 			     struct vestigial_inpcb *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tcp_input.c,v 1.340 2015/05/15 18:03:45 kefren Exp $	*/
+/*	$NetBSD: tcp_input.c,v 1.341 2015/05/24 15:43:45 rtr 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
  *    documentation and/or other materials provided with the distribution.
 @@ -138,27 +138,27 @@
  */
 /*
  *	TODO list for SYN cache stuff:
+ *
  *	Find room for a "state" field, which is needed to keep a
  *	compressed state for TIME_WAIT TCBs.  It's been noted already
  *	that this is fairly important for very high-volume web and
  *	mail servers, which use a large number of short-lived
  *	connections.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.340 2015/05/15 18:03:45 kefren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.341 2015/05/24 15:43:45 rtr Exp $");
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_inet_csum.h"
 #include "opt_tcp_debug.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>
 @@ -3908,27 +3908,26 @@ syn_cache_lookup(const struct sockaddr *
  */
 struct socket *
 syn_cache_get(struct sockaddr *src, struct sockaddr *dst,
     struct tcphdr *th, unsigned int hlen, unsigned int tlen,
     struct socket *so, struct mbuf *m)
+{
 	struct syn_cache *sc;
 	struct syn_cache_head *scp;
 	struct inpcb *inp = NULL;
 #ifdef INET6
 	struct in6pcb *in6p = NULL;
 #endif
 	struct tcpcb *tp = 0;
 	struct mbuf *am;
 	int s;
 	struct socket *oso;
 	s = splsoftnet();
 	if ((sc = syn_cache_lookup(src, dst, &scp)) == NULL) {
 		splx(s);
 		return (NULL);
+	}
 	/*
 	 * Verify the sequence and ack numbers.  Try getting the correct
 	 * response again.
 	 */
 @@ -4059,65 +4058,56 @@ syn_cache_get(struct sockaddr *src, stru
 	 * Give the new socket our cached route reference.
 	 */
 	if (inp) {
 		rtcache_copy(&inp->inp_route, &sc->sc_route);
 		rtcache_free(&sc->sc_route);
+	}
 #ifdef INET6
 	else {
 		rtcache_copy(&in6p->in6p_route, &sc->sc_route);
 		rtcache_free(&sc->sc_route);
+	}
 #endif
 	am = m_get(M_DONTWAIT, MT_SONAME);	/* XXX */
 	if (am == NULL)
 		goto resetandabort;
 	MCLAIM(am, &tcp_mowner);
 	am->m_len = src->sa_len;
 	bcopy(src, mtod(am, void *), src->sa_len);
 	if (inp) {
-		if (in_pcbconnect_m(inp, am, &lwp0)) {
+		struct sockaddr_in sin;
-			(void) m_free(am);
+		memcpy(&sin, src, src->sa_len);
 		if (in_pcbconnect(inp, &sin, &lwp0)) {
 			goto resetandabort;
+		}
+	}
 #ifdef INET6
 	else if (in6p) {
 		struct sockaddr_in6 sin6;
 		memcpy(&sin6, src, src->sa_len);
 		if (src->sa_family == AF_INET) {
 			/* IPv4 packet to AF_INET6 socket */
-			struct sockaddr_in6 *sin6;
+			memset(&sin6, 0, sizeof(sin6));
-			sin6 = mtod(am, struct sockaddr_in6 *);
+			sin6.sin6_family = AF_INET6;
-			am->m_len = sizeof(*sin6);
+			sin6.sin6_len = sizeof(sin6);
-			memset(sin6, 0, sizeof(*sin6));
+			sin6.sin6_port = ((struct sockaddr_in *)src)->sin_port;
-			sin6->sin6_family = AF_INET6;
+			sin6.sin6_addr.s6_addr16[5] = htons(0xffff);
 			sin6->sin6_len = sizeof(*sin6);
 			sin6->sin6_port = ((struct sockaddr_in *)src)->sin_port;
 			sin6->sin6_addr.s6_addr16[5] = htons(0xffff);
 			bcopy(&((struct sockaddr_in *)src)->sin_addr,
-				&sin6->sin6_addr.s6_addr32[3],
+				&sin6.sin6_addr.s6_addr32[3],
-				sizeof(sin6->sin6_addr.s6_addr32[3]));
+				sizeof(sin6.sin6_addr.s6_addr32[3]));
+		}
-		if (in6_pcbconnect_m(in6p, am, NULL)) {
+		if (in6_pcbconnect(in6p, &sin6, NULL)) {
 			(void) m_free(am);
 			goto resetandabort;
+		}
+	}
 #endif
 	else {
 		(void) m_free(am);
 		goto resetandabort;
+	}
 	(void) m_free(am);
 	if (inp)
 		tp = intotcpcb(inp);
 #ifdef INET6
 	else if (in6p)
 		tp = in6totcpcb(in6p);
 #endif
 	else
 		tp = NULL;
 	tp->t_flags = sototcpcb(oso)->t_flags & TF_NODELAY;
 	if (sc->sc_request_r_scale != 15) {
 		tp->requested_s_scale = sc->sc_requested_s_scale;
 		tp->request_r_scale = sc->sc_request_r_scale;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: in6_pcb.c,v 1.141 2015/05/19 01:14:40 ozaki-r Exp $	*/
+/*	$NetBSD: in6_pcb.c,v 1.142 2015/05/24 15:43:45 rtr 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.141 2015/05/19 01:14:40 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.142 2015/05/24 15:43:45 rtr Exp $");
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include <sys/param.h>
 #include <sys/systm.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>
 @@ -408,41 +408,26 @@ in6_pcbbind(void *v, struct sockaddr_in6
 		in6p->in6p_laddr = in6addr_any;
 		return (error);
+	}
 #if 0
 	in6p->in6p_flowinfo = 0;	/* XXX */
 #endif
 	return (0);
+}
 /*
  * adapter function that accepts nam as mbuf for in6_pcbconnect
  */
 int
 in6_pcbconnect_m(void *v, struct mbuf *nam, struct lwp *l)
 	struct sockaddr_in6 *sin6 = mtod(nam, struct sockaddr_in6 *);
 	if (sizeof (*sin6) != nam->m_len) {
 		return EINVAL;
 	return in6_pcbconnect(v, sin6, l);
 /*
  * Connect from a socket to a specified address.
  * Both address and port must be specified in argument sin6.
  * If don't have a local address for this socket yet,
  * then pick one.
  */
 int
 in6_pcbconnect(void *v, struct sockaddr_in6 *sin6, struct lwp *l)
+{
 	struct in6pcb *in6p = v;
 	struct in6_addr *in6a = NULL;
 	struct ifnet *ifp = NULL;	/* outgoing interface */
 	int error = 0;
 	int scope_ambiguous = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: in6_pcb.h,v 1.45 2015/05/02 17:18:03 rtr Exp $	*/
+/*	$NetBSD: in6_pcb.h,v 1.46 2015/05/24 15:43:45 rtr 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
 @@ -148,27 +148,26 @@ struct	in6pcb {
 	(((faddr)->s6_addr32[0] ^ (faddr)->s6_addr32[1] ^	\
 	  (faddr)->s6_addr32[2] ^ (faddr)->s6_addr32[3] ^	\
 	  (laddr)->s6_addr32[0] ^ (laddr)->s6_addr32[1] ^	\
 	  (laddr)->s6_addr32[2] ^ (laddr)->s6_addr32[3])	\
 	 + (fport) + (lport))
 #define sotoin6pcb(so)	((struct in6pcb *)(so)->so_pcb)
 void	in6_losing(struct in6pcb *);
 void	in6_pcbinit(struct inpcbtable *, int, int);
 int	in6_pcballoc(struct socket *, void *);
 int	in6_pcbbind(void *, struct sockaddr_in6 *, struct lwp *);
 int	in6_pcbconnect(void *, struct sockaddr_in6 *, struct lwp *);
 int	in6_pcbconnect_m(void *, struct mbuf *, struct lwp *);
 void	in6_pcbdetach(struct in6pcb *);
 void	in6_pcbdisconnect(struct in6pcb *);
 struct	in6pcb *in6_pcblookup_port(struct inpcbtable *, struct in6_addr *,
 				   u_int, int, struct vestigial_inpcb *);
 int	in6_pcbnotify(struct inpcbtable *, const struct sockaddr *,
 	u_int, const struct sockaddr *, u_int, int, void *,
 	void (*)(struct in6pcb *, int));
 void	in6_pcbpurgeif0(struct inpcbtable *, struct ifnet *);
 void	in6_pcbpurgeif(struct inpcbtable *, struct ifnet *);
 void	in6_pcbstate(struct in6pcb *, int);
 void	in6_rtchange(struct in6pcb *, int);
 void	in6_setpeeraddr(struct in6pcb *, struct sockaddr_in6 *);
 void	in6_setsockaddr(struct in6pcb *, struct sockaddr_in6 *);