diff options
| author | Yoshinobu Inoue <shin@FreeBSD.org> | 1999-12-22 19:13:38 +0000 |
|---|---|---|
| committer | Yoshinobu Inoue <shin@FreeBSD.org> | 1999-12-22 19:13:38 +0000 |
| commit | 6a800098cc0778c9618a89f858021624722374bd (patch) | |
| tree | 9cd3718d0c142edcd3154715cf1b5c93cd5c0d82 /sys/netinet6/icmp6.c | |
| parent | 2e636eed154504de1062c0a338b1f3f78c7ac4a0 (diff) | |
| download | src-6a800098cc0778c9618a89f858021624722374bd.tar.gz src-6a800098cc0778c9618a89f858021624722374bd.zip | |
IPSEC support in the kernel.
pr_input() routines prototype is also changed to support IPSEC and IPV6
chained protocol headers.
Reviewed by: freebsd-arch, cvs-committers
Obtained from: KAME project
Notes
Notes:
svn path=/head/; revision=55009
Diffstat (limited to 'sys/netinet6/icmp6.c')
| -rw-r--r-- | sys/netinet6/icmp6.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index f7d03cdcfc00..02c221961ad3 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -64,7 +64,7 @@ * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 */ -#include "opt_key.h" +#include "opt_ipsec.h" #include <sys/param.h> #include <sys/systm.h> @@ -96,15 +96,15 @@ #ifdef IPSEC #include <netinet6/ipsec.h> +#include <netinet6/ah.h> #include <netinet6/ipsec6.h> +#include <netinet6/ah6.h> #include <netkey/key.h> -#ifdef KEY_DEBUG +#ifdef IPSEC_DEBUG #include <netkey/key_debug.h> #else -#define DPRINTF(lev,arg) -#define DDO(lev, stmt) -#define DP(x, y, z) -#endif /* KEY_DEBUG */ +#define KEYDEBUG(lev,arg) +#endif #endif /* IPSEC */ #include "faith.h" @@ -1285,9 +1285,6 @@ icmp6_reflect(m, off) */ m->m_flags &= ~(M_BCAST|M_MCAST); -#ifdef IPSEC - m->m_pkthdr.rcvif = NULL; -#endif /*IPSEC*/ #ifdef COMPAT_RFC1885 ip6_output(m, NULL, &icmp6_reflect_rt, 0, NULL, &outif); @@ -1725,9 +1722,6 @@ noredhdropt:; = in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), ntohs(ip6->ip6_plen)); /* send the packet to outside... */ -#ifdef IPSEC - m->m_pkthdr.rcvif = NULL; -#endif /*IPSEC*/ ip6_output(m, NULL, NULL, 0, NULL, &outif); if (outif) { icmp6_ifstat_inc(outif, ifs6_out_msg); |