From owner-svn-src-projects@freebsd.org  Thu Dec 22 14:04:42 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2EA0C8A942
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu, 22 Dec 2016 14:04:42 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 72D9FDC3;
 Thu, 22 Dec 2016 14:04:42 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBME4fkr069228;
 Thu, 22 Dec 2016 14:04:41 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBME4fIi069227;
 Thu, 22 Dec 2016 14:04:41 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201612221404.uBME4fIi069227@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 22 Dec 2016 14:04:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r310403 - projects/ipsec/sys/netinet6
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Dec 2016 14:04:42 -0000

Author: ae
Date: Thu Dec 22 14:04:41 2016
New Revision: 310403
URL: https://svnweb.freebsd.org/changeset/base/310403

Log:
  Convert ip6_forward.c to use IPsec methods.

Modified:
  projects/ipsec/sys/netinet6/ip6_forward.c

Modified: projects/ipsec/sys/netinet6/ip6_forward.c
==============================================================================
--- projects/ipsec/sys/netinet6/ip6_forward.c	Thu Dec 22 14:03:01 2016	(r310402)
+++ projects/ipsec/sys/netinet6/ip6_forward.c	Thu Dec 22 14:04:41 2016	(r310403)
@@ -69,9 +69,7 @@ __FBSDID("$FreeBSD$");
 
 #include <netinet/in_pcb.h>
 
-#ifdef IPSEC
-#include <netinet6/ip6_ipsec.h>
-#endif /* IPSEC */
+#include <netipsec/ipsec_support.h>
 
 /*
  * Forward a packet.  If some error occurs return the sender
@@ -152,22 +150,17 @@ ip6_forward(struct mbuf *m, int srcrt)
 #endif
 		ip6->ip6_hlim -= IPV6_HLIMDEC;
 
-#ifdef IPSEC
-	if (IPSEC_FORWARD(ipv6, m, &error) != 0) {
-		/* mbuf consumed by IPsec */
-		m_freem(mcopy);
-		return;
-	}
-	/*
-	 * mbuf wasn't consumed by IPsec, check error code.
-	 */
-	if (error != 0) {
-		IP6STAT_INC(ip6s_cantforward);
-		m_freem(mcopy);
-		m_freem(m);
-		return;
+#if defined(IPSEC) || defined(IPSEC_SUPPORT)
+	if (IPSEC_ENABLED(ipv6)) {
+		if ((error = IPSEC_FORWARD(ipv4, m)) != 0) {
+			/* mbuf consumed by IPsec */
+			m_freem(mcopy);
+			if (error != EINPROGRESS)
+				IP6STAT_INC(ip6s_cantforward);
+			return;
+		}
+		/* No IPsec processing required */
 	}
-	/* No IPsec processing required */
 #endif
 again:
 	bzero(&rin6, sizeof(struct route_in6));