diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-22 17:13:31 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-22 17:13:31 -0300 |
| commit | f1832699781cbd404f0f9b60a41fe59c8cc4dd1a (patch) | |
| tree | d49e1d5035507aac3542f1e5bbf425b0a97b9d61 /sys/netinet/ip_input.c | |
| parent | 0a3437aa52c010dc2ab10b9778a383fef436382c (diff) | |
| parent | b899cad3faf3673f41a3fcf021164dcd7ee19a7e (diff) | |
| download | FreeBSD-src-f1832699781cbd404f0f9b60a41fe59c8cc4dd1a.zip FreeBSD-src-f1832699781cbd404f0f9b60a41fe59c8cc4dd1a.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/netinet/ip_input.c')
| -rw-r--r-- | sys/netinet/ip_input.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 1eefadc..287417c 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -77,8 +77,6 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip_carp.h> #ifdef IPSEC #include <netinet/ip_ipsec.h> -#include <netipsec/ipsec.h> -#include <netipsec/key.h> #endif /* IPSEC */ #include <sys/socketvar.h> @@ -469,22 +467,12 @@ tooshort: } else m_adj(m, ip_len - m->m_pkthdr.len); } - /* Try to forward the packet, but if we fail continue */ #ifdef IPSEC - /* For now we do not handle IPSEC in tryforward. */ - if (!key_havesp(IPSEC_DIR_INBOUND) && !key_havesp(IPSEC_DIR_OUTBOUND) && - (V_ipforwarding == 1)) - if (ip_tryforward(m) == NULL) - return; /* * Bypass packet filtering for packets previously handled by IPsec. */ if (ip_ipsec_filtertunnel(m)) goto passin; -#else - if (V_ipforwarding == 1) - if (ip_tryforward(m) == NULL) - return; #endif /* IPSEC */ /* |
