Module Name: src
Committed By: riz
Date: Mon Feb 11 21:49:50 UTC 2013
Modified Files:
src/lib/libnpf [netbsd-6]: npf.3 npf.c npf.h
src/sys/modules/npf [netbsd-6]: Makefile
src/sys/net/npf [netbsd-6]: files.npf npf.c npf.h npf_alg.c
npf_alg_icmp.c npf_ctl.c npf_handler.c npf_impl.h npf_inet.c
npf_instr.c npf_nat.c npf_ncode.h npf_processor.c npf_rproc.c
npf_ruleset.c npf_sendpkt.c npf_session.c npf_state.c
npf_tableset.c
src/sys/rump/net/lib/libnpf [netbsd-6]: Makefile
src/usr.sbin/npf/npfctl [netbsd-6]: Makefile npf.conf.5 npf_build.c
npf_disassemble.c npf_parse.y npf_scan.l npfctl.8 npfctl.c npfctl.h
src/usr.sbin/npf/npftest [netbsd-6]: Makefile README npftest.conf
src/usr.sbin/npf/npftest/libnpftest [netbsd-6]: npf_rule_test.c
src/usr.sbin/pf/ftp-proxy [netbsd-6]: Makefile
Added Files:
src/sys/net/npf [netbsd-6]: npf_conf.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #817):
usr.sbin/npf/npfctl/npfctl.8: revision 1.12
usr.sbin/npf/npfctl/npf.conf.5: revision 1.27
usr.sbin/npf/npfctl/npf_parse.y: revision 1.18
usr.sbin/npf/npfctl/npf_build.c: revision 1.20
usr.sbin/npf/npfctl/npfctl.c: revision 1.28
lib/libnpf/npf.c: revision 1.16
usr.sbin/npf/npfctl/npfctl.c: revision 1.29
lib/libnpf/npf.c: revision 1.17
sys/modules/npf/Makefile: revision 1.12
sys/net/npf/npf_rproc.c: revision 1.6
usr.sbin/npf/npftest/README: revision 1.4
sys/net/npf/npf_tableset.c: revision 1.17
sys/net/npf/npf_ctl.c: revision 1.21
sys/net/npf/npf_ctl.c: revision 1.22
usr.sbin/npf/npfctl/npfctl.h: revision 1.25
lib/libnpf/npf.h: revision 1.13
usr.sbin/npf/npftest/npftest.conf: revision 1.2
usr.sbin/npf/npfctl/npfctl.h: revision 1.26
sys/net/npf/npf_ruleset.c: revision 1.17
lib/libnpf/npf.h: revision 1.14
sys/net/npf/npf_ruleset.c: revision 1.18
sys/net/npf/npf_conf.c: revision 1.1
usr.sbin/npf/npfctl/npf_scan.l: revision 1.10
sys/net/npf/npf_conf.c: revision 1.2
sys/net/npf/npf_instr.c: revision 1.16
sys/net/npf/npf_handler.c: revision 1.26
sys/net/npf/npf_impl.h: revision 1.26
usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.14
sys/net/npf/npf_processor.c: revision 1.15
sys/net/npf/npf_impl.h: revision 1.27
sys/net/npf/npf_alg_icmp.c: revision 1.15
usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.15
usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.16
sys/net/npf/npf_ncode.h: revision 1.11
sys/net/npf/files.npf: revision 1.10
usr.sbin/npf/npftest/Makefile: revision 1.4
usr.sbin/npf/npfctl/npfctl.c: revision 1.30
lib/libnpf/npf.3: revision 1.8
usr.sbin/npf/npftest/libnpftest/npf_rule_test.c: revision 1.4
sys/net/npf/npf_session.c: revision 1.21
usr.sbin/npf/npftest/libnpftest/npf_rule_test.c: revision 1.5
usr.sbin/npf/npfctl/npf_build.c: revision 1.18
usr.sbin/npf/npfctl/npf_build.c: revision 1.19
sys/net/npf/npf_alg.c: revision 1.7
usr.sbin/npf/npfctl/Makefile: revision 1.10
sys/net/npf/npf_inet.c: revision 1.21
sys/net/npf/npf.h: revision 1.26
sys/net/npf/npf.h: revision 1.27
usr.sbin/pf/ftp-proxy/Makefile: revision 1.8
sys/net/npf/npf_nat.c: revision 1.19
sys/net/npf/npf.c: revision 1.15
sys/net/npf/npf_state.c: revision 1.14
sys/net/npf/npf_sendpkt.c: revision 1.14
sys/rump/net/lib/libnpf/Makefile: revision 1.4
IPv6 linklocal address printing cosmetics
NPF:
- Implement dynamic NPF rules. Controlled through npf(3) library of via
npfctl rule command. A rule can be removed using a unique identifier,
returned on addition, or using a key which is SHA1 hash of the rule.
Adjust npftest and add a regression test.
- Improvements to rule inspection mechanism.
- Initial BPF support as an alternative to n-code.
- Minor fixes; bump the version.
Disable -DWITH_NPF for now; will be converted to BPF mechanism.
- Fix NPF config reload with dynamic rules present.
- Implement list and flush commands on a dynamic ruleset.
Allow filtering on IP addresses even if the L4 protocol is unknown.
Patch from spz@.
npftest: adjust for recent change.
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.2 -r1.4.2.3 src/lib/libnpf/npf.3
cvs rdiff -u -r1.7.2.8 -r1.7.2.9 src/lib/libnpf/npf.c
cvs rdiff -u -r1.6.2.6 -r1.6.2.7 src/lib/libnpf/npf.h
cvs rdiff -u -r1.9.2.2 -r1.9.2.3 src/sys/modules/npf/Makefile
cvs rdiff -u -r1.6.2.3 -r1.6.2.4 src/sys/net/npf/files.npf
cvs rdiff -u -r1.7.2.6 -r1.7.2.7 src/sys/net/npf/npf.c
cvs rdiff -u -r1.14.2.11 -r1.14.2.12 src/sys/net/npf/npf.h
cvs rdiff -u -r1.2.16.4 -r1.2.16.5 src/sys/net/npf/npf_alg.c
cvs rdiff -u -r1.8.4.6 -r1.8.4.7 src/sys/net/npf/npf_alg_icmp.c
cvs rdiff -u -r0 -r1.2.2.2 src/sys/net/npf/npf_conf.c
cvs rdiff -u -r1.12.2.7 -r1.12.2.8 src/sys/net/npf/npf_ctl.c
cvs rdiff -u -r1.13.2.8 -r1.13.2.9 src/sys/net/npf/npf_handler.c
cvs rdiff -u -r1.10.2.12 -r1.10.2.13 src/sys/net/npf/npf_impl.h
cvs rdiff -u -r1.10.4.8 -r1.10.4.9 src/sys/net/npf/npf_inet.c \
src/sys/net/npf/npf_session.c
cvs rdiff -u -r1.9.2.6 -r1.9.2.7 src/sys/net/npf/npf_instr.c
cvs rdiff -u -r1.10.2.7 -r1.10.2.8 src/sys/net/npf/npf_nat.c
cvs rdiff -u -r1.5.6.4 -r1.5.6.5 src/sys/net/npf/npf_ncode.h
cvs rdiff -u -r1.9.2.4 -r1.9.2.5 src/sys/net/npf/npf_processor.c
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/net/npf/npf_rproc.c
cvs rdiff -u -r1.10.2.5 -r1.10.2.6 src/sys/net/npf/npf_ruleset.c
cvs rdiff -u -r1.8.4.5 -r1.8.4.6 src/sys/net/npf/npf_sendpkt.c
cvs rdiff -u -r1.6.4.7 -r1.6.4.8 src/sys/net/npf/npf_state.c
cvs rdiff -u -r1.9.2.7 -r1.9.2.8 src/sys/net/npf/npf_tableset.c
cvs rdiff -u -r1.2.4.4 -r1.2.4.5 src/sys/rump/net/lib/libnpf/Makefile
cvs rdiff -u -r1.5.2.4 -r1.5.2.5 src/usr.sbin/npf/npfctl/Makefile
cvs rdiff -u -r1.9.2.7 -r1.9.2.8 src/usr.sbin/npf/npfctl/npf.conf.5
cvs rdiff -u -r1.4.2.10 -r1.4.2.11 src/usr.sbin/npf/npfctl/npf_build.c
cvs rdiff -u -r1.3.2.10 -r1.3.2.11 src/usr.sbin/npf/npfctl/npf_disassemble.c \
src/usr.sbin/npf/npfctl/npf_parse.y
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/usr.sbin/npf/npfctl/npf_scan.l
cvs rdiff -u -r1.6.6.4 -r1.6.6.5 src/usr.sbin/npf/npfctl/npfctl.8
cvs rdiff -u -r1.10.2.13 -r1.10.2.14 src/usr.sbin/npf/npfctl/npfctl.c
cvs rdiff -u -r1.11.2.11 -r1.11.2.12 src/usr.sbin/npf/npfctl/npfctl.h
cvs rdiff -u -r1.2.2.3 -r1.2.2.4 src/usr.sbin/npf/npftest/Makefile
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/usr.sbin/npf/npftest/README
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/usr.sbin/npf/npftest/npftest.conf
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 \
src/usr.sbin/npf/npftest/libnpftest/npf_rule_test.c
cvs rdiff -u -r1.6 -r1.6.6.1 src/usr.sbin/pf/ftp-proxy/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
