diff options
author | luigi <luigi@FreeBSD.org> | 2009-12-15 16:15:14 +0000 |
---|---|---|
committer | luigi <luigi@FreeBSD.org> | 2009-12-15 16:15:14 +0000 |
commit | c4e6c7a490d49b3d223f8dfbc5978cd7abefc6ff (patch) | |
tree | 36cbadf9b9732e76c72e3e2eb0b4b62a48ef743d /sys/net | |
parent | 2ffe7d61d93a8c10c0336f394d7c3614ae58d642 (diff) | |
download | FreeBSD-src-c4e6c7a490d49b3d223f8dfbc5978cd7abefc6ff.zip FreeBSD-src-c4e6c7a490d49b3d223f8dfbc5978cd7abefc6ff.tar.gz |
Start splitting ip_fw2.c and ip_fw.h into smaller components.
At this time we pull out from ip_fw2.c the logging functions, and
support for dynamic rules, and move kernel-only stuff into
netinet/ipfw/ip_fw_private.h
No ABI change involved in this commit, unless I made some mistake.
ip_fw.h has changed, though not in the userland-visible part.
Files touched by this commit:
conf/files
now references the two new source files
netinet/ip_fw.h
remove kernel-only definitions gone into netinet/ipfw/ip_fw_private.h.
netinet/ipfw/ip_fw_private.h
new file with kernel-specific ipfw definitions
netinet/ipfw/ip_fw_log.c
ipfw_log and related functions
netinet/ipfw/ip_fw_dynamic.c
code related to dynamic rules
netinet/ipfw/ip_fw2.c
removed the pieces that goes in the new files
netinet/ipfw/ip_fw_nat.c
minor rearrangement to remove LOOKUP_NAT from the
main headers. This require a new function pointer.
A bunch of other kernel files that included netinet/ip_fw.h now
require netinet/ipfw/ip_fw_private.h as well.
Not 100% sure i caught all of them.
MFC after: 1 month
Diffstat (limited to 'sys/net')
-rw-r--r-- | sys/net/if_bridge.c | 1 | ||||
-rw-r--r-- | sys/net/if_ethersubr.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 8e0e6e1..d7de38e 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -134,6 +134,7 @@ __FBSDID("$FreeBSD$"); #include <net/route.h> #include <netinet/ip_fw.h> +#include <netinet/ipfw/ip_fw_private.h> #include <netinet/ip_dummynet.h> /* diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 5dff9bc..8d06926 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -71,6 +71,7 @@ #include <netinet/in_var.h> #include <netinet/if_ether.h> #include <netinet/ip_fw.h> +#include <netinet/ipfw/ip_fw_private.h> #include <netinet/ip_dummynet.h> #include <netinet/ip_var.h> #endif |