Date: Thu, 22 Dec 2016 13:50:34 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r310395 - projects/ipsec/sys/netinet Message-ID: <201612221350.uBMDoYFw061017@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Thu Dec 22 13:50:34 2016 New Revision: 310395 URL: https://svnweb.freebsd.org/changeset/base/310395 Log: Add IPSEC_SUPPORT option to in_pcb.c Modified: projects/ipsec/sys/netinet/in_pcb.c Modified: projects/ipsec/sys/netinet/in_pcb.c ============================================================================== --- projects/ipsec/sys/netinet/in_pcb.c Thu Dec 22 13:48:28 2016 (r310394) +++ projects/ipsec/sys/netinet/in_pcb.c Thu Dec 22 13:50:34 2016 (r310395) @@ -96,11 +96,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/ip6_var.h> #endif /* INET6 */ - -#ifdef IPSEC -#include <netipsec/ipsec.h> -#include <netipsec/key.h> -#endif /* IPSEC */ +#include <netipsec/ipsec_support.h> #include <security/mac/mac_framework.h> @@ -303,7 +299,7 @@ in_pcballoc(struct socket *so, struct in goto out; mac_inpcb_create(so, inp); #endif -#ifdef IPSEC +#if defined(IPSEC) || defined(IPSEC_SUPPORT) error = ipsec_init_pcbpolicy(inp); if (error != 0) { #ifdef MAC @@ -1278,7 +1274,7 @@ in_pcbfree(struct inpcb *inp) INP_WLOCK_ASSERT(inp); /* XXXRW: Do as much as possible here. */ -#ifdef IPSEC +#if defined(IPSEC) || defined(IPSEC_SUPPORT) if (inp->inp_sp != NULL) ipsec_delete_pcbpolicy(inp); #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612221350.uBMDoYFw061017>