From owner-svn-src-projects@freebsd.org Thu Dec 22 14:03:02 2016 Return-Path: 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 AED6CC8A91D for ; Thu, 22 Dec 2016 14:03:02 +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 650C6C9A; Thu, 22 Dec 2016 14:03:02 +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 uBME31ti069138; Thu, 22 Dec 2016 14:03:01 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBME317A069137; Thu, 22 Dec 2016 14:03:01 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201612221403.uBME317A069137@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Thu, 22 Dec 2016 14:03:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r310402 - projects/ipsec/sys/netinet 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2016 14:03:02 -0000 Author: ae Date: Thu Dec 22 14:03:01 2016 New Revision: 310402 URL: https://svnweb.freebsd.org/changeset/base/310402 Log: Convert UDP code to use IPsec methods. Modified: projects/ipsec/sys/netinet/udp_usrreq.c Modified: projects/ipsec/sys/netinet/udp_usrreq.c ============================================================================== --- projects/ipsec/sys/netinet/udp_usrreq.c Thu Dec 22 14:02:18 2016 (r310401) +++ projects/ipsec/sys/netinet/udp_usrreq.c Thu Dec 22 14:03:01 2016 (r310402) @@ -92,10 +92,7 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef IPSEC -#include -#include -#endif +#include #include @@ -330,15 +327,16 @@ udp_append(struct inpcb *inp, struct ip off += sizeof(struct udphdr); -#ifdef IPSEC +#if defined(IPSEC) || defined(IPSEC_SUPPORT) /* Check AH/ESP integrity. */ - if (ipsec4_in_reject(n, inp)) { + if (IPSEC_ENABLED(ipv4) && + IPSEC_CHECK_POLICY(ipv4, n, inp) != 0) { m_freem(n); return (0); } - KASSERT(up != NULL, ("%s: udpcb NULL", __func__)); if (up->u_flags & UF_ESPINUDP) {/* IPSec UDP encaps. */ - if (udp_ipsec_input(n, off, AF_INET) != 0) + if (IPSEC_ENABLED(ipv4) && + UDPENCAP_INPUT(n, off, AF_INET) != 0) return (0); /* Consumed. */ } #endif /* IPSEC */ @@ -1008,9 +1006,13 @@ udp_ctloutput(struct socket *so, struct switch (sopt->sopt_dir) { case SOPT_SET: switch (sopt->sopt_name) { -#ifdef IPSEC +#if defined(IPSEC) || defined(IPSEC_SUPPORT) case UDP_ENCAP: - error = udp_ipsec_pcbctl(inp, sopt); + if (!IPSEC_ENABLED(ipv4)) { + INP_WUNLOCK(inp); + return (ENOPROTOOPT); + } + error = UDPENCAP_PCBCTL(inp, sopt); break; #endif case UDPLITE_SEND_CSCOV: @@ -1049,9 +1051,13 @@ udp_ctloutput(struct socket *so, struct break; case SOPT_GET: switch (sopt->sopt_name) { -#ifdef IPSEC +#if defined(IPSEC) || defined(IPSEC_SUPPORT) case UDP_ENCAP: - error = udp_ipsec_pcbctl(inp, sopt); + if (!IPSEC_ENABLED(ipv4)) { + INP_WUNLOCK(inp); + return (ENOPROTOOPT); + } + error = UDPENCAP_PCBCTL(inp, sopt); break; #endif case UDPLITE_SEND_CSCOV: