From owner-svn-src-projects@freebsd.org Wed Jan 25 13:27:20 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 7A79ECBE9B3 for ; Wed, 25 Jan 2017 13:27:20 +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 3B606998; Wed, 25 Jan 2017 13:27:20 +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 v0PDRJVR019425; Wed, 25 Jan 2017 13:27:19 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0PDRJvQ019420; Wed, 25 Jan 2017 13:27:19 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201701251327.v0PDRJvQ019420@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 13:27:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r312753 - in projects/ipsec/sys: netinet netipsec 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 13:27:20 -0000 Author: ae Date: Wed Jan 25 13:27:18 2017 New Revision: 312753 URL: https://svnweb.freebsd.org/changeset/base/312753 Log: More fixes for NOINET build. Modified: projects/ipsec/sys/netinet/tcp_input.c projects/ipsec/sys/netinet/tcp_output.c projects/ipsec/sys/netipsec/ipsec_input.c projects/ipsec/sys/netipsec/ipsec_output.c Modified: projects/ipsec/sys/netinet/tcp_input.c ============================================================================== --- projects/ipsec/sys/netinet/tcp_input.c Wed Jan 25 13:22:48 2017 (r312752) +++ projects/ipsec/sys/netinet/tcp_input.c Wed Jan 25 13:27:18 2017 (r312753) @@ -929,12 +929,17 @@ findpcb: if (isipv6 && IPSEC_ENABLED(ipv6) && IPSEC_CHECK_POLICY(ipv6, m, inp) != 0) { goto dropunlock; - } else + } +#ifdef INET + else +#endif #endif /* INET6 */ +#ifdef INET if (IPSEC_ENABLED(ipv4) && IPSEC_CHECK_POLICY(ipv4, m, inp) != 0) { goto dropunlock; } +#endif /* INET */ #endif /* IPSEC */ /* Modified: projects/ipsec/sys/netinet/tcp_output.c ============================================================================== --- projects/ipsec/sys/netinet/tcp_output.c Wed Jan 25 13:22:48 2017 (r312752) +++ projects/ipsec/sys/netinet/tcp_output.c Wed Jan 25 13:27:18 2017 (r312753) @@ -557,11 +557,15 @@ after_sack_rexmit: #ifdef INET6 if (isipv6 && IPSEC_ENABLED(ipv6)) ipsec_optlen = IPSEC_HDRSIZE(ipv6, tp->t_inpcb); +#ifdef INET else #endif +#endif /* INET6 */ +#ifdef INET if (IPSEC_ENABLED(ipv4)) ipsec_optlen = IPSEC_HDRSIZE(ipv4, tp->t_inpcb); -#endif +#endif /* INET */ +#endif /* IPSEC */ #ifdef INET6 if (isipv6) ipoptlen = ip6_optlen(tp->t_inpcb); Modified: projects/ipsec/sys/netipsec/ipsec_input.c ============================================================================== --- projects/ipsec/sys/netipsec/ipsec_input.c Wed Jan 25 13:22:48 2017 (r312752) +++ projects/ipsec/sys/netipsec/ipsec_input.c Wed Jan 25 13:27:18 2017 (r312753) @@ -474,7 +474,7 @@ ipsec6_input(struct mbuf *m, int offset, /* * Enforce IPsec policy checking if we are seeing last header. */ - if (ipsec4_in_reject(m, NULL) != 0) { + if (ipsec6_in_reject(m, NULL) != 0) { /* Forbidden by inbound security policy */ m_freem(m); return (EACCES); Modified: projects/ipsec/sys/netipsec/ipsec_output.c ============================================================================== --- projects/ipsec/sys/netipsec/ipsec_output.c Wed Jan 25 13:22:48 2017 (r312752) +++ projects/ipsec/sys/netipsec/ipsec_output.c Wed Jan 25 13:27:18 2017 (r312753) @@ -786,6 +786,7 @@ ipsec_process_done(struct mbuf *m, struc } key_freesp(&sp), sp = NULL; /* Release reference to SP */ +#ifdef INET /* * Do UDP encapsulation if SA requires it. */ @@ -794,6 +795,7 @@ ipsec_process_done(struct mbuf *m, struc if (error != 0) goto bad; } +#endif /* INET */ /* * We're done with IPsec processing, transmit the packet using the * appropriate network protocol (IP or IPv6).