diff options
author | julian <julian@FreeBSD.org> | 2009-08-21 11:20:10 +0000 |
---|---|---|
committer | julian <julian@FreeBSD.org> | 2009-08-21 11:20:10 +0000 |
commit | b4694ea2c6ce4d683b775b3d5c7da7d331864a16 (patch) | |
tree | afa592da98bc02ee59b3326919b0cdec0db5851d /sys/netinet/ip_fw.h | |
parent | 4bee45ee42a755baeeff48f27281058726c5b19e (diff) | |
download | FreeBSD-src-b4694ea2c6ce4d683b775b3d5c7da7d331864a16.zip FreeBSD-src-b4694ea2c6ce4d683b775b3d5c7da7d331864a16.tar.gz |
Fix ipfw's initialization functions to get the correct order of evaluation
to allow vnet and non vnet operation. Move some functions from ip_fw_pfil.c
to ip_fw2.c and mode to mostly using the SYSINIT and VNET_SYSINIT handlers
instead of the modevent handler. Correct some spelling errors in comments
in the affected code. Note this bug fixes a crash in NON VIMAGE kernels when
ipfw is unloaded.
This patch is a minimal patch for 8.0
I have a much larger patch that actually fixes the underlying problems
that will be applied after 8.0
Reviewed by: zec@, rwatson@, bz@(earlier version)
Approved by: re (rwatson)
MFC after: Immediatly
Diffstat (limited to 'sys/netinet/ip_fw.h')
-rw-r--r-- | sys/netinet/ip_fw.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h index 18920a0..9967a29 100644 --- a/sys/netinet/ip_fw.h +++ b/sys/netinet/ip_fw.h @@ -645,8 +645,10 @@ int ipfw_check_out(void *, struct mbuf **, struct ifnet *, int, struct inpcb *in int ipfw_chk(struct ip_fw_args *); -int ipfw_init(void); -void ipfw_destroy(void); +int ipfw_hook(void); +int ipfw6_hook(void); +int ipfw_unhook(void); +int ipfw6_unhook(void); #ifdef NOTYET void ipfw_nat_destroy(void); #endif |