 @@ -1,14 +1,14 @@
-/*	$NetBSD: tcp_subr.c,v 1.272 2018/01/19 07:53:01 ozaki-r Exp $	*/
+/*	$NetBSD: tcp_subr.c,v 1.273 2018/02/26 08:50:25 maxv 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.
 @@ -81,27 +81,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.
+ *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.272 2018/01/19 07:53:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.273 2018/02/26 08:50:25 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_inet_csum.h"
 #include "opt_mbuftrace.h"
 #endif
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 @@ -2341,50 +2341,50 @@ tcp_new_iss1(void *laddr, void *faddr, u
 #if defined(IPSEC)
 /* compute ESP/AH header size for TCP, including outer IP header. */
 size_t
 ipsec4_hdrsiz_tcp(struct tcpcb *tp)
+{
 	struct inpcb *inp;
 	size_t hdrsiz;
 	/* XXX mapped addr case (tp->t_in6pcb) */
 	if (!tp || !tp->t_template || !(inp = tp->t_inpcb))
 		return 0;
 	switch (tp->t_family) {
 	case AF_INET:
-		/* XXX: should use currect direction. */
+		/* XXX: should use correct direction. */
-		hdrsiz = ipsec4_hdrsiz(tp->t_template, IPSEC_DIR_OUTBOUND, inp);
+		hdrsiz = ipsec_hdrsiz(tp->t_template, IPSEC_DIR_OUTBOUND, inp);
 		break;
 	default:
 		hdrsiz = 0;
 		break;
+	}
 	return hdrsiz;
+}
 #ifdef INET6
 size_t
 ipsec6_hdrsiz_tcp(struct tcpcb *tp)
+{
 	struct in6pcb *in6p;
 	size_t hdrsiz;
 	if (!tp || !tp->t_template || !(in6p = tp->t_in6pcb))
 		return 0;
 	switch (tp->t_family) {
 	case AF_INET6:
-		/* XXX: should use currect direction. */
+		/* XXX: should use correct direction. */
-		hdrsiz = ipsec6_hdrsiz(tp->t_template, IPSEC_DIR_OUTBOUND, in6p);
+		hdrsiz = ipsec_hdrsiz(tp->t_template, IPSEC_DIR_OUTBOUND, in6p);
 		break;
 	case AF_INET:
 		/* mapped address case - tricky */
 	default:
 		hdrsiz = 0;
 		break;
+	}
 	return hdrsiz;
+}
 #endif
 #endif /*IPSEC*/

 @@ -1,14 +1,14 @@
-/* $NetBSD: ipsec.c,v 1.137 2018/02/26 08:42:16 maxv Exp $ */
+/* $NetBSD: ipsec.c,v 1.138 2018/02/26 08:50:25 maxv Exp $ */
 /* $FreeBSD: src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
 /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane 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
 @@ -22,27 +22,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.137 2018/02/26 08:42:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.138 2018/02/26 08:50:25 maxv Exp $");
 /*
  * IPsec controller part.
  */
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 @@ -768,27 +768,27 @@ ipsec4_forward(struct mbuf *m, int *dest
 	 * XXX quickhack!!!
 	 */
 	struct secpolicy *sp;
 	size_t ipsechdr;
 	int error;
 	sp = ipsec_getpolicybyaddr(m, IPSEC_DIR_OUTBOUND, IP_FORWARDING,
 	    &error);
 	if (sp == NULL) {
 		return EINVAL;
+	}
 	/* Count IPsec header size. */
-	ipsechdr = ipsec4_hdrsiz(m, IPSEC_DIR_OUTBOUND, NULL);
+	ipsechdr = ipsec_hdrsiz(m, IPSEC_DIR_OUTBOUND, NULL);
 	/*
 	 * Find the correct route for outer IPv4 header, compute tunnel MTU.
 	 */
 	if (sp->req) {
 		struct secasvar *sav;
 		sav = ipsec_lookup_sa(sp->req, m);
 		if (sav != NULL) {
 			struct route *ro;
 			struct rtentry *rt;
 			ro = &sav->sah->sa_route;
 @@ -1835,83 +1835,53 @@ ipsec_sp_hdrsiz(const struct secpolicy *
 				    "IPsec tunnel SA\n",
 				    ((const struct sockaddr *)&isr->saidx.dst)
 				    ->sa_family);
 				break;
+			}
+		}
 		siz += clen;
+	}
 	return siz;
+}
 size_t
-ipsec4_hdrsiz(struct mbuf *m, u_int dir, struct inpcb *inp)
+ipsec_hdrsiz(struct mbuf *m, u_int dir, void *inp)
+{
 	struct inpcb_hdr *inph = (struct inpcb_hdr *)inp;
 	struct secpolicy *sp;
 	int error;
 	size_t size;
 	KASSERT(m != NULL);
 	KASSERTMSG(inph == NULL || inph->inph_socket != NULL,
 	    "socket w/o inpcb");
 	if (inph == NULL)
 		sp = ipsec_getpolicybyaddr(m, dir, IP_FORWARDING, &error);
 	else
 		sp = ipsec_getpolicybysock(m, dir, inph, &error);
 	if (sp != NULL) {
 		size = ipsec_sp_hdrsiz(sp, m);
 		KEYDEBUG_PRINTF(KEYDEBUG_IPSEC_DATA, "size:%zu.\n", size);
 		KEY_SP_UNREF(&sp);
 	} else {
 		size = 0;
+	}
 	return size;
+}
 #ifdef INET6
 size_t
 ipsec6_hdrsiz(struct mbuf *m, u_int dir, struct in6pcb *in6p)
 	struct inpcb_hdr *inph = (struct inpcb_hdr *)in6p;
 	struct secpolicy *sp;
 	int error;
 	size_t size;
 	KASSERT(m != NULL);
 	KASSERTMSG(inph == NULL || inph->inph_socket != NULL,
 	    "socket w/o inpcb");
 	if (inph == NULL)
 		sp = ipsec_getpolicybyaddr(m, dir, IP_FORWARDING, &error);
 	else
 		sp = ipsec_getpolicybysock(m, dir, inph, &error);
 	if (sp != NULL) {
 		size = ipsec_sp_hdrsiz(sp, m);
 		KEYDEBUG_PRINTF(KEYDEBUG_IPSEC_DATA, "size:%zu.\n", size);
 		KEY_SP_UNREF(&sp);
 	} else {
 		size = 0;
 	return size;
 #endif
 /*
  * Check the variable replay window.
  * ipsec_chkreplay() performs replay check before ICV verification.
  * ipsec_updatereplay() updates replay bitmap.  This must be called after
  * ICV verification (it also performs replay check, which is usually done
  * beforehand).
  * 0 (zero) is returned if packet disallowed, 1 if packet permitted.
+ *
  * based on RFC 2401.
  */
 int
 ipsec_chkreplay(u_int32_t seq, const struct secasvar *sav)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ipsec.h,v 1.67 2018/02/21 16:18:52 maxv Exp $	*/
+/*	$NetBSD: ipsec.h,v 1.68 2018/02/26 08:50:25 maxv Exp $	*/
 /*	$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $	*/
 /*	$KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 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
 @@ -294,27 +294,27 @@ u_int ipsec_get_reqlevel(const struct ip
 int ipsec4_set_policy(struct inpcb *, int, const void *, size_t, kauth_cred_t);
 int ipsec4_get_policy(struct inpcb *, const void *, size_t, struct mbuf **);
 int ipsec4_delete_pcbpolicy(struct inpcb *);
 int ipsec4_in_reject(struct mbuf *, struct inpcb *);
 struct secasvar *ipsec_lookup_sa(const struct ipsecrequest *,
     const struct mbuf *);
 struct secas;
 struct tcpcb;
 int ipsec_chkreplay(u_int32_t, const struct secasvar *);
 int ipsec_updatereplay(u_int32_t, const struct secasvar *);
-size_t ipsec4_hdrsiz(struct mbuf *, u_int, struct inpcb *);
+size_t ipsec_hdrsiz(struct mbuf *, u_int, void *);
 size_t ipsec4_hdrsiz_tcp(struct tcpcb *);
 union sockaddr_union;
 const char *ipsec_address(const union sockaddr_union* sa, char *, size_t);
 const char *ipsec_logsastr(const struct secasvar *, char *, size_t);
 void ipsec_dumpmbuf(struct mbuf *);
 /* NetBSD protosw ctlin entrypoint */
 void *esp4_ctlinput(int, const struct sockaddr *, void *);
 void *ah4_ctlinput(int, const struct sockaddr *, void *);
 void ipsec_output_init(void);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: net_stub.c,v 1.27 2017/08/02 01:28:02 ozaki-r Exp $	*/
+/*	$NetBSD: net_stub.c,v 1.28 2018/02/26 08:50:25 maxv Exp $	*/
 /*
  * Copyright (c) 2008 Antti Kantee.  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.
+ *
 @@ -16,27 +16,27 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: net_stub.c,v 1.27 2017/08/02 01:28:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: net_stub.c,v 1.28 2018/02/26 08:50:25 maxv Exp $");
 #include <sys/mutex.h>
 #include <sys/param.h>
 #include <sys/protosw.h>
 #include <sys/socketvar.h>
 #include <sys/pslist.h>
 #include <sys/psref.h>
 #include <net/if.h>
 #include <net/route.h>
 #include <netipsec/ipsec.h>
 #include <netipsec/ipsec6.h>
 @@ -81,39 +81,38 @@ int ipsec_debug;
 int ipsec_enabled;
 int ipsec_used;
 percpu_t *ipsecstat_percpu;
 u_int ipsec_spdgen;
 __weak_alias(ah4_ctlinput,rumpnet_stub);
 __weak_alias(ah6_ctlinput,rumpnet_stub);
 __weak_alias(esp4_ctlinput,rumpnet_stub);
 __weak_alias(esp6_ctlinput,rumpnet_stub);
 __weak_alias(ipsec4_output,rumpnet_stub);
 __weak_alias(ipsec4_common_input,rumpnet_stub);
 __weak_alias(ipsec4_delete_pcbpolicy,rumpnet_stub);
 __weak_alias(ipsec4_forward,rumpnet_stub);
 __weak_alias(ipsec4_hdrsiz,rumpnet_stub);
 __weak_alias(ipsec4_input,rumpnet_stub);
 __weak_alias(ipsec4_in_reject,rumpnet_stub);
 __weak_alias(ipsec4_set_policy,rumpnet_stub);
 __weak_alias(ipsec6_common_input,rumpnet_stub);
 __weak_alias(ipsec6_input,rumpnet_stub);
 __weak_alias(ipsec6_check_policy,rumpnet_stub);
 __weak_alias(ipsec6_delete_pcbpolicy,rumpnet_stub);
 __weak_alias(ipsec6_get_policy,rumpnet_stub);
 __weak_alias(ipsec6_in_reject,rumpnet_stub);
 __weak_alias(ipsec6_hdrsiz,rumpnet_stub);
 __weak_alias(ipsec6_process_packet,rumpnet_stub);
 __weak_alias(ipsec6_set_policy,rumpnet_stub);
 __weak_alias(ipsec_hdrsiz,rumpnet_stub);
 __weak_alias(ipsec_init_policy,rumpnet_stub);
 __weak_alias(ipsec_pcbconn,rumpnet_stub);
 __weak_alias(ipsec_pcbdisconn,rumpnet_stub);
 __weak_alias(key_sa_routechange,rumpnet_stub);
 __weak_alias(key_sp_unref,rumpnet_stub);
 struct ifnet_head ifnet_list;
 struct pslist_head ifnet_pslist;
 kmutex_t ifnet_mtx;
 int
 compat_ifconf(u_long cmd, void *data)
+{