diff options
| author | gnn <gnn@FreeBSD.org> | 2007-07-03 12:13:45 +0000 |
|---|---|---|
| committer | gnn <gnn@FreeBSD.org> | 2007-07-03 12:13:45 +0000 |
| commit | aeca69ded51d6233029432f2819670cdedc399fa (patch) | |
| tree | 33a53f093fb66f940c2ed2dd7aab6c80eeaeafce /sys/netinet/in_pcb.c | |
| parent | d5177fc84ed40844713b6dc0352469ffbb12e526 (diff) | |
| download | FreeBSD-src-aeca69ded51d6233029432f2819670cdedc399fa.zip FreeBSD-src-aeca69ded51d6233029432f2819670cdedc399fa.tar.gz | |
Commit the change from FAST_IPSEC to IPSEC. The FAST_IPSEC
option is now deprecated, as well as the KAME IPsec code.
What was FAST_IPSEC is now IPSEC.
Approved by: re
Sponsored by: Secure Computing
Diffstat (limited to 'sys/netinet/in_pcb.c')
| -rw-r--r-- | sys/netinet/in_pcb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index edb7702..5e174ea 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -74,10 +74,10 @@ #endif /* INET6 */ -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netipsec/ipsec.h> #include <netipsec/key.h> -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ #include <security/mac/mac_framework.h> @@ -193,11 +193,11 @@ in_pcballoc(struct socket *so, struct inpcbinfo *pcbinfo) SOCK_UNLOCK(so); #endif -#ifdef FAST_IPSEC +#ifdef IPSEC error = ipsec_init_policy(so, &inp->inp_sp); if (error != 0) goto out; -#endif /*FAST_IPSEC*/ +#endif /*IPSEC*/ #ifdef INET6 if (INP_SOCKAF(so) == AF_INET6) { inp->inp_vflag |= INP_IPV6PROTO; @@ -215,7 +215,7 @@ in_pcballoc(struct socket *so, struct inpcbinfo *pcbinfo) INP_LOCK(inp); inp->inp_gencnt = ++pcbinfo->ipi_gencnt; -#if defined(FAST_IPSEC) || defined(MAC) +#if defined(IPSEC) || defined(MAC) out: if (error != 0) uma_zfree(pcbinfo->ipi_zone, inp); @@ -711,9 +711,9 @@ in_pcbfree(struct inpcb *inp) INP_INFO_WLOCK_ASSERT(ipi); INP_LOCK_ASSERT(inp); -#ifdef FAST_IPSEC +#ifdef IPSEC ipsec4_delete_pcbpolicy(inp); -#endif /*FAST_IPSEC*/ +#endif /*IPSEC*/ inp->inp_gencnt = ++ipi->ipi_gencnt; in_pcbremlists(inp); if (inp->inp_options) |
