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 | |
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')
-rw-r--r-- | sys/netinet/in_pcb.c | 14 | ||||
-rw-r--r-- | sys/netinet/in_proto.c | 12 | ||||
-rw-r--r-- | sys/netinet/ip_fw2.c | 2 | ||||
-rw-r--r-- | sys/netinet/ip_icmp.c | 4 | ||||
-rw-r--r-- | sys/netinet/ip_input.c | 20 | ||||
-rw-r--r-- | sys/netinet/ip_ipsec.c | 20 | ||||
-rw-r--r-- | sys/netinet/ip_output.c | 16 | ||||
-rw-r--r-- | sys/netinet/raw_ip.c | 8 | ||||
-rw-r--r-- | sys/netinet/sctp_input.c | 2 | ||||
-rw-r--r-- | sys/netinet/sctp_os_bsd.h | 4 | ||||
-rw-r--r-- | sys/netinet/sctp_pcb.c | 8 | ||||
-rw-r--r-- | sys/netinet/sctp_usrreq.c | 6 | ||||
-rw-r--r-- | sys/netinet/tcp_input.c | 8 | ||||
-rw-r--r-- | sys/netinet/tcp_output.c | 6 | ||||
-rw-r--r-- | sys/netinet/tcp_subr.c | 8 | ||||
-rw-r--r-- | sys/netinet/tcp_syncache.c | 6 | ||||
-rw-r--r-- | sys/netinet/udp_usrreq.c | 6 |
17 files changed, 75 insertions, 75 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) diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index 21d7413..0d08d53 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -69,9 +69,9 @@ static struct pr_usrreqs nousrreqs; -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netipsec/ipsec.h> -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ #ifdef SCTP #include <netinet/in_pcb.h> @@ -210,7 +210,7 @@ struct protosw inetsw[] = { .pr_ctloutput = rip_ctloutput, .pr_usrreqs = &rip_usrreqs }, -#ifdef FAST_IPSEC +#ifdef IPSEC { .pr_type = SOCK_RAW, .pr_domain = &inetdomain, @@ -237,7 +237,7 @@ struct protosw inetsw[] = { .pr_input = ipcomp4_input, .pr_usrreqs = &nousrreqs }, -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ { .pr_type = SOCK_RAW, .pr_domain = &inetdomain, @@ -368,14 +368,14 @@ SYSCTL_NODE(_net_inet, IPPROTO_TCP, tcp, CTLFLAG_RW, 0, "TCP"); SYSCTL_NODE(_net_inet, IPPROTO_SCTP, sctp, CTLFLAG_RW, 0, "SCTP"); #endif SYSCTL_NODE(_net_inet, IPPROTO_IGMP, igmp, CTLFLAG_RW, 0, "IGMP"); -#ifdef FAST_IPSEC +#ifdef IPSEC /* XXX no protocol # to use, pick something "reserved" */ SYSCTL_NODE(_net_inet, 253, ipsec, CTLFLAG_RW, 0, "IPSEC"); SYSCTL_NODE(_net_inet, IPPROTO_AH, ah, CTLFLAG_RW, 0, "AH"); SYSCTL_NODE(_net_inet, IPPROTO_ESP, esp, CTLFLAG_RW, 0, "ESP"); SYSCTL_NODE(_net_inet, IPPROTO_IPCOMP, ipcomp, CTLFLAG_RW, 0, "IPCOMP"); SYSCTL_NODE(_net_inet, IPPROTO_IPIP, ipip, CTLFLAG_RW, 0, "IPIP"); -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ SYSCTL_NODE(_net_inet, IPPROTO_RAW, raw, CTLFLAG_RW, 0, "RAW"); #ifdef DEV_PFSYNC SYSCTL_NODE(_net_inet, IPPROTO_PFSYNC, pfsync, CTLFLAG_RW, 0, "PFSYNC"); diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c index 367d67c..72c11ac 100644 --- a/sys/netinet/ip_fw2.c +++ b/sys/netinet/ip_fw2.c @@ -3143,7 +3143,7 @@ check_body: break; case O_IPSEC: -#ifdef FAST_IPSEC +#ifdef IPSEC match = (m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL) != NULL); #endif diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index c1a2ae4..b330699 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -59,7 +59,7 @@ #include <netinet/tcpip.h> #include <netinet/icmp_var.h> -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netipsec/ipsec.h> #include <netipsec/key.h> #endif @@ -579,7 +579,7 @@ reflect: (struct sockaddr *)0, RTF_GATEWAY | RTF_HOST, (struct sockaddr *)&icmpgw); pfctlinput(PRC_REDIRECT_HOST, (struct sockaddr *)&icmpsrc); -#ifdef FAST_IPSEC +#ifdef IPSEC key_sa_routechange((struct sockaddr *)&icmpsrc); #endif break; diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 9a10230..f7a0ed3 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -70,9 +70,9 @@ #ifdef DEV_CARP #include <netinet/ip_carp.h> #endif -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netinet/ip_ipsec.h> -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ #include <sys/socketvar.h> @@ -391,13 +391,13 @@ tooshort: } else m_adj(m, ip->ip_len - m->m_pkthdr.len); } -#ifdef FAST_IPSEC +#ifdef IPSEC /* * Bypass packet filtering for packets from a tunnel (gif). */ if (ip_ipsec_filtergif(m)) goto passin; -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ /* * Run through list of hooks for input packets. @@ -601,10 +601,10 @@ passin: ipstat.ips_cantforward++; m_freem(m); } else { -#ifdef FAST_IPSEC +#ifdef IPSEC if (ip_ipsec_fwd(m)) goto bad; -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ ip_forward(m, dchg); } return; @@ -645,7 +645,7 @@ ours: */ ip->ip_len -= hlen; -#ifdef FAST_IPSEC +#ifdef IPSEC /* * enforce IPsec policy checking if we are seeing last header. * note that we do not visit this with protocols with pcb layer @@ -653,7 +653,7 @@ ours: */ if (ip_ipsec_input(m)) goto bad; -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ /* * Switch out to protocol's input routine. @@ -1390,9 +1390,9 @@ ip_forward(struct mbuf *m, int srcrt) type = ICMP_UNREACH; code = ICMP_UNREACH_NEEDFRAG; -#ifdef FAST_IPSEC +#ifdef IPSEC mtu = ip_ipsec_mtu(m); -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ /* * If the MTU wasn't set before use the interface mtu or * fall back to the next smaller mtu step compared to the diff --git a/sys/netinet/ip_ipsec.c b/sys/netinet/ip_ipsec.c index f240b41..593bb5a 100644 --- a/sys/netinet/ip_ipsec.c +++ b/sys/netinet/ip_ipsec.c @@ -55,11 +55,11 @@ #include <machine/in_cksum.h> -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netipsec/ipsec.h> #include <netipsec/xform.h> #include <netipsec/key.h> -#endif /*FAST_IPSEC*/ +#endif /*IPSEC*/ extern struct protosw inetsw[]; @@ -71,7 +71,7 @@ extern struct protosw inetsw[]; int ip_ipsec_filtergif(struct mbuf *m) { -#if defined(FAST_IPSEC) && !defined(IPSEC_FILTERGIF) +#if defined(IPSEC) && !defined(IPSEC_FILTERGIF) /* * Bypass packet filtering for packets from a tunnel (gif). */ @@ -90,7 +90,7 @@ ip_ipsec_filtergif(struct mbuf *m) int ip_ipsec_fwd(struct mbuf *m) { -#ifdef FAST_IPSEC +#ifdef IPSEC struct m_tag *mtag; struct tdb_ident *tdbi; struct secpolicy *sp; @@ -122,7 +122,7 @@ ip_ipsec_fwd(struct mbuf *m) ipstat.ips_cantforward++; return 1; } -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ return 0; } @@ -137,7 +137,7 @@ int ip_ipsec_input(struct mbuf *m) { struct ip *ip = mtod(m, struct ip *); -#ifdef FAST_IPSEC +#ifdef IPSEC struct m_tag *mtag; struct tdb_ident *tdbi; struct secpolicy *sp; @@ -179,7 +179,7 @@ ip_ipsec_input(struct mbuf *m) if (error) return 1; } -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ return 0; } @@ -237,14 +237,14 @@ ip_ipsec_mtu(struct mbuf *m) * * Called from ip_output(). * 1 = drop packet, 0 = continue processing packet, - * -1 = packet was reinjected and stop processing packet (FAST_IPSEC only) + * -1 = packet was reinjected and stop processing packet */ int ip_ipsec_output(struct mbuf **m, struct inpcb *inp, int *flags, int *error, struct route **ro, struct route *iproute, struct sockaddr_in **dst, struct in_ifaddr **ia, struct ifnet **ifp) { -#ifdef FAST_IPSEC +#ifdef IPSEC struct secpolicy *sp = NULL; struct ip *ip = mtod(*m, struct ip *); struct tdb_ident *tdbi; @@ -381,6 +381,6 @@ bad: if (sp != NULL) KEY_FREESP(&sp); return 1; -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ return 0; } diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 90a21ef..a93571d 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -59,10 +59,10 @@ #include <netinet/ip_var.h> #include <netinet/ip_options.h> -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netinet/ip_ipsec.h> #include <netipsec/ipsec.h> -#endif /* FAST_IPSEC*/ +#endif /* IPSEC*/ #include <machine/in_cksum.h> @@ -412,7 +412,7 @@ again: } sendit: -#ifdef FAST_IPSEC +#ifdef IPSEC switch(ip_ipsec_output(&m, inp, &flags, &error, &ro, &iproute, &dst, &ia, &ifp)) { case 1: goto bad; @@ -425,7 +425,7 @@ sendit: /* Update variables that are affected by ipsec4_output(). */ ip = mtod(m, struct ip *); hlen = ip->ip_hl << 2; -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ /* Jump over all PFIL processing if hooks are not active. */ if (!PFIL_HOOKED(&inet_pfil_hook)) @@ -966,7 +966,7 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt) INP_UNLOCK(inp); break; -#ifdef FAST_IPSEC +#ifdef IPSEC case IP_IPSEC_POLICY: { caddr_t req; @@ -1000,7 +1000,7 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt) m_freem(m); break; } -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ default: error = ENOPROTOOPT; @@ -1104,7 +1104,7 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt) error = inp_getmoptions(inp, sopt); break; -#ifdef FAST_IPSEC +#ifdef IPSEC case IP_IPSEC_POLICY: { struct mbuf *m = NULL; @@ -1122,7 +1122,7 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt) m_freem(m); break; } -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ default: error = ENOPROTOOPT; diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 1a1b4e0..85b010d 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -66,9 +66,9 @@ #include <netinet/ip_fw.h> #include <netinet/ip_dummynet.h> -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netipsec/ipsec.h> -#endif /*FAST_IPSEC*/ +#endif /*IPSEC*/ #include <security/mac/mac_framework.h> @@ -155,12 +155,12 @@ raw_append(struct inpcb *last, struct ip *ip, struct mbuf *n) INP_LOCK_ASSERT(last); -#ifdef FAST_IPSEC +#ifdef IPSEC /* check AH/ESP integrity. */ if (ipsec4_in_reject(n, last)) { policyfail = 1; } -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ #ifdef MAC if (!policyfail && mac_check_inpcb_deliver(last, n) != 0) policyfail = 1; diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index 8b1ebce..5f29214 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -4927,7 +4927,7 @@ sctp_skip_csum_4: } else if (stcb == NULL) { refcount_up = 1; } -#ifdef FAST_IPSEC +#ifdef IPSEC /* * I very much doubt any of the IPSEC stuff will work but I have no * idea, so I will leave it in place. diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h index b199e10..99d0ce9 100644 --- a/sys/netinet/sctp_os_bsd.h +++ b/sys/netinet/sctp_os_bsd.h @@ -74,14 +74,14 @@ __FBSDID("$FreeBSD$"); #include <netinet/icmp_var.h> -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netipsec/ipsec.h> #include <netipsec/key.h> #endif /* IPSEC */ #ifdef INET6 #include <sys/domain.h> -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netipsec/ipsec6.h> #endif #include <netinet/ip6.h> diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 84b367b..260c628 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -1807,7 +1807,7 @@ sctp_inpcb_alloc(struct socket *so, uint32_t vrf_id) inp->partial_delivery_point = SCTP_SB_LIMIT_RCV(so) >> SCTP_PARTIAL_DELIVERY_SHIFT; inp->sctp_frag_point = SCTP_DEFAULT_MAXSEGMENT; -#ifdef FAST_IPSEC +#ifdef IPSEC { struct inpcbpolicy *pcb_sp = NULL; @@ -1821,7 +1821,7 @@ sctp_inpcb_alloc(struct socket *so, uint32_t vrf_id) SCTP_INP_INFO_WUNLOCK(); return error; } -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ SCTP_INCR_EP_COUNT(); inp->ip_inp.inp.inp_ip_ttl = ip_defttl; SCTP_INP_INFO_WUNLOCK(); @@ -2833,9 +2833,9 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from) */ cnt = 0; if (so) { -#ifdef FAST_IPSEC +#ifdef IPSEC ipsec4_delete_pcbpolicy(ip_pcb); -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ /* Unlocks not needed since the socket is gone now */ } diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 446036b..a62497c 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -485,7 +485,7 @@ sctp_attach(struct socket *so, int proto, struct thread *p) int error; uint32_t vrf_id = SCTP_DEFAULT_VRFID; -#ifdef FAST_IPSEC +#ifdef IPSEC uint32_t flags; #endif inp = (struct sctp_inpcb *)so->so_pcb; @@ -508,7 +508,7 @@ sctp_attach(struct socket *so, int proto, struct thread *p) ip_inp->inp_vflag |= INP_IPV4; ip_inp->inp_ip_ttl = ip_defttl; -#ifdef FAST_IPSEC +#ifdef IPSEC error = ipsec_init_policy(so, &ip_inp->inp_sp); #ifdef SCTP_LOG_CLOSING sctp_log_closing(inp, NULL, 17); @@ -528,7 +528,7 @@ sctp_attach(struct socket *so, int proto, struct thread *p) } return error; } -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ SCTP_INP_WUNLOCK(inp); return 0; } diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 9d31c79..b09b5c4 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -82,10 +82,10 @@ #include <netinet/tcp_debug.h> #endif /* TCPDEBUG */ -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netipsec/ipsec.h> #include <netipsec/ipsec6.h> -#endif /*FAST_IPSEC*/ +#endif /*IPSEC*/ #include <machine/in_cksum.h> @@ -445,7 +445,7 @@ findpcb: m->m_pkthdr.rcvif); } -#ifdef FAST_IPSEC +#ifdef IPSEC #ifdef INET6 if (isipv6 && inp != NULL && ipsec6_in_reject(m, inp)) { ipsec6stat.in_polvio++; @@ -456,7 +456,7 @@ findpcb: ipsec4stat.in_polvio++; goto dropunlock; } -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ /* * If the INPCB does not exist then all data in the incoming diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index d80254a..6d552d9 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -72,9 +72,9 @@ #include <netinet/tcp_debug.h> #endif -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netipsec/ipsec.h> -#endif /*FAST_IPSEC*/ +#endif /*IPSEC*/ #include <machine/in_cksum.h> @@ -695,7 +695,7 @@ send: offsetof(struct ipoption, ipopt_list); else ipoptlen = 0; -#ifdef FAST_IPSEC +#ifdef IPSEC ipoptlen += ipsec_hdrsiz_tcp(tp); #endif diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 589714f..29ed2f1 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -91,14 +91,14 @@ #endif #include <netinet6/ip6protosw.h> -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netipsec/ipsec.h> #include <netipsec/xform.h> #ifdef INET6 #include <netipsec/ipsec6.h> #endif #include <netipsec/key.h> -#endif /*FAST_IPSEC*/ +#endif /*IPSEC*/ #include <machine/in_cksum.h> #include <sys/md5.h> @@ -1634,7 +1634,7 @@ tcp_maxmtu6(struct in_conninfo *inc, int *flags) } #endif /* INET6 */ -#ifdef FAST_IPSEC +#ifdef IPSEC /* compute ESP/AH header size for TCP, including outer IP header. */ size_t ipsec_hdrsiz_tcp(struct tcpcb *tp) @@ -1675,7 +1675,7 @@ ipsec_hdrsiz_tcp(struct tcpcb *tp) m_free(m); return (hdrsiz); } -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ /* * TCP BANDWIDTH DELAY PRODUCT WINDOW LIMITING diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 9e03f32..c1e4beb 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -80,13 +80,13 @@ #include <netinet6/tcp6_var.h> #endif -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netipsec/ipsec.h> #ifdef INET6 #include <netipsec/ipsec6.h> #endif #include <netipsec/key.h> -#endif /*FAST_IPSEC*/ +#endif /*IPSEC*/ #include <machine/in_cksum.h> @@ -621,7 +621,7 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) inp->inp_lport = 0; goto abort; } -#ifdef FAST_IPSEC +#ifdef IPSEC /* Copy old policy into new socket's. */ if (ipsec_copy_policy(sotoinpcb(lso)->inp_sp, inp->inp_sp)) printf("syncache_socket: could not copy policy\n"); diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index ae03b54..9391f07 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -78,7 +78,7 @@ #include <netinet/udp.h> #include <netinet/udp_var.h> -#ifdef FAST_IPSEC +#ifdef IPSEC #include <netipsec/ipsec.h> #endif @@ -495,14 +495,14 @@ udp_append(struct inpcb *inp, struct ip *ip, struct mbuf *n, int off, INP_LOCK_ASSERT(inp); -#ifdef FAST_IPSEC +#ifdef IPSEC /* check AH/ESP integrity. */ if (ipsec4_in_reject(n, inp)) { ipsec4stat.in_polvio++; m_freem(n); return; } -#endif /* FAST_IPSEC */ +#endif /* IPSEC */ #ifdef MAC if (mac_check_inpcb_deliver(inp, n) != 0) { m_freem(n); |