diff options
| author | Julian Elischer <julian@FreeBSD.org> | 2006-10-21 00:16:31 +0000 |
|---|---|---|
| committer | Julian Elischer <julian@FreeBSD.org> | 2006-10-21 00:16:31 +0000 |
| commit | 010b65f54aa2b95ad18ebb87afb5a1880afde135 (patch) | |
| tree | 934f39d21fda8ade814da603677390a78df6405d /sys/netinet | |
| parent | 38b3d206f4294090c609dc589cc36d6e116b12cc (diff) | |
Notes
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_fw_pfil.c | 8 | ||||
| -rw-r--r-- | sys/netinet/ip_input.c | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sys/netinet/ip_fw_pfil.c b/sys/netinet/ip_fw_pfil.c index b0cf77e00591..a58f96fe9040 100644 --- a/sys/netinet/ip_fw_pfil.c +++ b/sys/netinet/ip_fw_pfil.c @@ -80,14 +80,6 @@ ip_divert_packet_t *ip_divert_ptr = NULL; /* ng_ipfw hooks. */ ng_ipfw_input_t *ng_ipfw_input_p = NULL; -/* - * ipfw_ether and ipfw_bridge hooks. - * XXX: Temporary until those are converted to pfil_hooks as well. - */ -ip_fw_chk_t *ip_fw_chk_ptr = NULL; -ip_dn_io_t *ip_dn_io_ptr = NULL; -int fw_one_pass = 1; - /* Forward declarations. */ static int ipfw_divert(struct mbuf **, int, int); #define DIV_DIR_IN 1 diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 99d4566b8c08..84768a7f2d58 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -77,6 +77,10 @@ #include <sys/socketvar.h> +/* XXX: Temporary until ipfw_ether and ipfw_bridge are converted. */ +#include <netinet/ip_fw.h> +#include <netinet/ip_dummynet.h> + int rsvp_on = 0; int ipforwarding = 0; @@ -188,6 +192,14 @@ SYSCTL_INT(_net_inet_ip, OID_AUTO, stealth, CTLFLAG_RW, &ipstealth, 0, ""); #endif +/* + * ipfw_ether and ipfw_bridge hooks. + * XXX: Temporary until those are converted to pfil_hooks as well. + */ +ip_fw_chk_t *ip_fw_chk_ptr = NULL; +ip_dn_io_t *ip_dn_io_ptr = NULL; +int fw_one_pass = 1; + static void ip_freef(struct ipqhead *, struct ipq *); /* |