diff options
author | Brooks Davis <brooks@FreeBSD.org> | 2001-09-25 18:40:52 +0000 |
---|---|---|
committer | Brooks Davis <brooks@FreeBSD.org> | 2001-09-25 18:40:52 +0000 |
commit | 9494d5968ff60672ca84b345e32dde28113cbf36 (patch) | |
tree | 047925a0cd0ed3cd9eac86164bb29b8242a91c33 /sys/netinet/ip_input.c | |
parent | 0ec8be8404d4307f84f035fca10cb45cbea0e83d (diff) | |
download | src-9494d5968ff60672ca84b345e32dde28113cbf36.tar.gz src-9494d5968ff60672ca84b345e32dde28113cbf36.zip |
Make faith loadable, unloadable, and clonable.
Notes
Notes:
svn path=/head/; revision=83934
Diffstat (limited to 'sys/netinet/ip_input.c')
-rw-r--r-- | sys/netinet/ip_input.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 69eb78d8e06b..d80c7d4f72cb 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -60,6 +60,7 @@ #include <net/pfil.h> #include <net/if.h> +#include <net/if_types.h> #include <net/if_var.h> #include <net/if_dl.h> #include <net/route.h> @@ -84,11 +85,6 @@ #include <netkey/key.h> #endif -#include "faith.h" -#if defined(NFAITH) && NFAITH > 0 -#include <net/if_types.h> -#endif - #ifdef DUMMYNET #include <netinet/ip_dummynet.h> #endif @@ -557,6 +553,7 @@ pass: * the packets are received. */ checkif = ip_checkinterface && (ipforwarding == 0) && + m->m_pkthdr.rcvif != NULL && ((m->m_pkthdr.rcvif->if_flags & IFF_LOOPBACK) == 0) && (ip_fw_fwd_addr == NULL); @@ -634,7 +631,6 @@ pass: if (ip->ip_dst.s_addr == INADDR_ANY) goto ours; -#if defined(NFAITH) && 0 < NFAITH /* * FAITH(Firewall Aided Internet Translator) */ @@ -646,7 +642,7 @@ pass: m_freem(m); return; } -#endif + /* * Not for us; forward if possible and desirable. */ |