From owner-svn-src-projects@freebsd.org Wed Jan 25 03:15:03 2017 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 7F623CBFB47 for ; Wed, 25 Jan 2017 03:15:03 +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 3543216C8; Wed, 25 Jan 2017 03:15:03 +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 v0P3F2uU073469; Wed, 25 Jan 2017 03:15:02 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0P3F2um073467; Wed, 25 Jan 2017 03:15:02 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201701250315.v0P3F2um073467@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Wed, 25 Jan 2017 03:15:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r312734 - in projects/ipsec/sys: modules/ipsec 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: Wed, 25 Jan 2017 03:15:03 -0000 Author: ae Date: Wed Jan 25 03:15:02 2017 New Revision: 312734 URL: https://svnweb.freebsd.org/changeset/base/312734 Log: Build NAT-T code only when INET support is enabled. Modified: projects/ipsec/sys/modules/ipsec/Makefile projects/ipsec/sys/netinet/udp_usrreq.c Modified: projects/ipsec/sys/modules/ipsec/Makefile ============================================================================== --- projects/ipsec/sys/modules/ipsec/Makefile Wed Jan 25 02:33:17 2017 (r312733) +++ projects/ipsec/sys/modules/ipsec/Makefile Wed Jan 25 03:15:02 2017 (r312734) @@ -4,8 +4,9 @@ KMOD= ipsec SRCS= if_ipsec.c ipsec.c ipsec_input.c ipsec_mbuf.c ipsec_mod.c \ - ipsec_output.c udpencap.c xform_ah.c xform_esp.c xform_ipcomp.c \ + ipsec_output.c xform_ah.c xform_esp.c xform_ipcomp.c \ opt_inet.h opt_inet6.h opt_ipsec.h opt_sctp.h +SRCS.INET= udpencap.c opt_ipsec.h: @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} Modified: projects/ipsec/sys/netinet/udp_usrreq.c ============================================================================== --- projects/ipsec/sys/netinet/udp_usrreq.c Wed Jan 25 02:33:17 2017 (r312733) +++ projects/ipsec/sys/netinet/udp_usrreq.c Wed Jan 25 03:15:02 2017 (r312734) @@ -1007,6 +1007,7 @@ udp_ctloutput(struct socket *so, struct case SOPT_SET: switch (sopt->sopt_name) { #if defined(IPSEC) || defined(IPSEC_SUPPORT) +#ifdef INET case UDP_ENCAP: if (!IPSEC_ENABLED(ipv4)) { INP_WUNLOCK(inp); @@ -1014,7 +1015,8 @@ udp_ctloutput(struct socket *so, struct } error = UDPENCAP_PCBCTL(inp, sopt); break; -#endif +#endif /* INET */ +#endif /* IPSEC */ case UDPLITE_SEND_CSCOV: case UDPLITE_RECV_CSCOV: if (!isudplite) { @@ -1052,6 +1054,7 @@ udp_ctloutput(struct socket *so, struct case SOPT_GET: switch (sopt->sopt_name) { #if defined(IPSEC) || defined(IPSEC_SUPPORT) +#ifdef INET case UDP_ENCAP: if (!IPSEC_ENABLED(ipv4)) { INP_WUNLOCK(inp); @@ -1059,7 +1062,8 @@ udp_ctloutput(struct socket *so, struct } error = UDPENCAP_PCBCTL(inp, sopt); break; -#endif +#endif /* INET */ +#endif /* IPSEC */ case UDPLITE_SEND_CSCOV: case UDPLITE_RECV_CSCOV: if (!isudplite) {