diff options
| author | bz <bz@FreeBSD.org> | 2011-04-27 19:28:42 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2011-04-27 19:28:42 +0000 |
| commit | d28e675043d30fd2673b02842a810b8aec8b1696 (patch) | |
| tree | 9428855084c7aa5ab9ab83364589dfafc87dbe6d /sys/netinet6/ip6_ipsec.c | |
| parent | 09fd1db2a07e44c41a4341b1dcc53c381d095ffd (diff) | |
| download | FreeBSD-src-d28e675043d30fd2673b02842a810b8aec8b1696.zip FreeBSD-src-d28e675043d30fd2673b02842a810b8aec8b1696.tar.gz | |
Make IPsec compile without INET adding appropriate #ifdef checks.
Unfold the IPSEC_COMMON_INPUT_CB() macro in xform_{ah,esp,ipcomp}.c
to not need three different versions depending on INET, INET6 or both.
Mark two places preparing for not yet supported functionality with IPv6.
Reviewed by: gnn
Sponsored by: The FreeBSD Foundation
Sponsored by: iXsystems
MFC after: 4 days
Diffstat (limited to 'sys/netinet6/ip6_ipsec.c')
| -rw-r--r-- | sys/netinet6/ip6_ipsec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/netinet6/ip6_ipsec.c b/sys/netinet6/ip6_ipsec.c index 96b09ef..8731e12 100644 --- a/sys/netinet6/ip6_ipsec.c +++ b/sys/netinet6/ip6_ipsec.c @@ -30,6 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" @@ -43,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/sysctl.h> +#include <sys/syslog.h> #include <net/if.h> #include <net/route.h> @@ -291,7 +293,11 @@ ip6_ipsec_output(struct mbuf **m, struct inpcb *inp, int *flags, int *error, * this is done in the normal processing path. */ if ((*m)->m_pkthdr.csum_flags & CSUM_DELAY_DATA) { + ipseclog((LOG_DEBUG, + "%s: we do not support IPv4 over IPv6", __func__)); +#ifdef INET in_delayed_cksum(*m); +#endif (*m)->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; } |
