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_proto.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_proto.c')
-rw-r--r-- | sys/netinet/in_proto.c | 12 |
1 files changed, 6 insertions, 6 deletions
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"); |