diff options
| author | glebius <glebius@FreeBSD.org> | 2012-09-14 11:51:49 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2012-09-14 11:51:49 +0000 |
| commit | 0ccf4838d7a8b4da2c3beaac7ea1fd977aa0ed11 (patch) | |
| tree | ec60da6e90cde2e87aa91ac9450c84ce3446233a /sys/netgraph | |
| parent | f99fc207edf21e7c05c1147864077ce3fe1f3e2c (diff) | |
| download | FreeBSD-src-0ccf4838d7a8b4da2c3beaac7ea1fd977aa0ed11.zip FreeBSD-src-0ccf4838d7a8b4da2c3beaac7ea1fd977aa0ed11.tar.gz | |
o Create directory sys/netpfil, where all packet filters should
reside, and move there ipfw(4) and pf(4).
o Move most modified parts of pf out of contrib.
Actual movements:
sys/contrib/pf/net/*.c -> sys/netpfil/pf/
sys/contrib/pf/net/*.h -> sys/net/
contrib/pf/pfctl/*.c -> sbin/pfctl
contrib/pf/pfctl/*.h -> sbin/pfctl
contrib/pf/pfctl/pfctl.8 -> sbin/pfctl
contrib/pf/pfctl/*.4 -> share/man/man4
contrib/pf/pfctl/*.5 -> share/man/man5
sys/netinet/ipfw -> sys/netpfil/ipfw
The arguable movement is pf/net/*.h -> sys/net. There are
future plans to refactor pf includes, so I decided not to
break things twice.
Not modified bits of pf left in contrib: authpf, ftp-proxy,
tftp-proxy, pflogd.
The ipfw(4) movement is planned to be merged to stable/9,
to make head and stable match.
Discussed with: bz, luigi
Diffstat (limited to 'sys/netgraph')
| -rw-r--r-- | sys/netgraph/ng_ipfw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/netgraph/ng_ipfw.c b/sys/netgraph/ng_ipfw.c index fe8ea89..907b5cb 100644 --- a/sys/netgraph/ng_ipfw.c +++ b/sys/netgraph/ng_ipfw.c @@ -48,11 +48,12 @@ #include <netinet/in_var.h> #include <netinet/ip_var.h> #include <netinet/ip_fw.h> -#include <netinet/ipfw/ip_fw_private.h> #include <netinet/ip.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> +#include <netpfil/ipfw/ip_fw_private.h> + #include <netgraph/ng_message.h> #include <netgraph/ng_parse.h> #include <netgraph/ng_ipfw.h> |
