Module Name: src Committed By: riz Date: Mon Aug 13 17:49:53 UTC 2012
Modified Files: src/lib/libnpf [netbsd-6]: npf.c npf.h src/sys/modules/npf [netbsd-6]: Makefile src/sys/net/npf [netbsd-6]: npf_handler.c npf_impl.h npf_nat.c npf_ruleset.c npf_session.c npf_state.c npf_tableset.c src/usr.sbin/npf/npfctl [netbsd-6]: npf_build.c npf_data.c npf_parse.y npfctl.c npfctl.h src/usr.sbin/npf/npftest [netbsd-6]: npfstream.c npftest.c npftest.h src/usr.sbin/npf/npftest/libnpftest [netbsd-6]: Makefile npf_test.h npf_test_subr.c Added Files: src/usr.sbin/npf/npftest [netbsd-6]: README npftest.conf src/usr.sbin/npf/npftest/libnpftest [netbsd-6]: npf_nat_test.c npf_rule_test.c Log Message: Pull up following revision(s) (requested by rmind in ticket #485): lib/libnpf/npf.c: revision 1.11 sys/net/npf/npf_session.c: revision 1.17 sys/modules/npf/Makefile: revision 1.10 usr.sbin/npf/npftest/npftest.c: revision 1.4 usr.sbin/npf/npftest/README: revision 1.1 sys/net/npf/npf_tableset.c: revision 1.14 usr.sbin/npf/npftest/npftest.h: revision 1.4 lib/libnpf/npf.h: revision 1.10 sys/net/npf/npf_ruleset.c: revision 1.14 usr.sbin/npf/npfctl/npf_data.c: revision 1.18 usr.sbin/npf/npftest/npftest.conf: revision 1.1 sys/net/npf/npf_handler.c: revision 1.21 sys/net/npf/npf_impl.h: revision 1.21 usr.sbin/npf/npfctl/npfctl.c: revision 1.18 usr.sbin/npf/npftest/libnpftest/npf_nat_test.c: revision 1.1 usr.sbin/npf/npfctl/npf_build.c: revision 1.13 usr.sbin/npf/npftest/libnpftest/npf_rule_test.c: revision 1.1 usr.sbin/npf/npftest/npfstream.c: revision 1.3 usr.sbin/npf/npftest/libnpftest/Makefile: revision 1.4 usr.sbin/npf/npfctl/npfctl.h: revision 1.19 sys/net/npf/npf_nat.c: revision 1.16 sys/net/npf/npf_state.c: revision 1.11 usr.sbin/npf/npftest/libnpftest/npf_test_subr.c: revision 1.3 usr.sbin/npf/npftest/libnpftest/npf_test.h: revision 1.5 usr.sbin/npf/npfctl/npf_parse.y: revision 1.12 - Extend npftest: add ruleset inspection testing from the config generated by npfctl debug functionality. Auto-create npftest interfaces for this. - NPF sessions: combine protocol and interface into a separate substructure, share between the entries and thus fix the handling of them. Constify. - npftest: add regression tests for NAT policies. - npf_build_nat: simplify and fix bi-NAT regression. - Bump yacc stack size for npfctl. To generate a diff of this commit: cvs rdiff -u -r1.7.2.3 -r1.7.2.4 src/lib/libnpf/npf.c cvs rdiff -u -r1.6.2.3 -r1.6.2.4 src/lib/libnpf/npf.h cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/modules/npf/Makefile cvs rdiff -u -r1.13.2.4 -r1.13.2.5 src/sys/net/npf/npf_handler.c cvs rdiff -u -r1.10.2.6 -r1.10.2.7 src/sys/net/npf/npf_impl.h cvs rdiff -u -r1.10.2.4 -r1.10.2.5 src/sys/net/npf/npf_nat.c cvs rdiff -u -r1.10.2.3 -r1.10.2.4 src/sys/net/npf/npf_ruleset.c cvs rdiff -u -r1.10.4.5 -r1.10.4.6 src/sys/net/npf/npf_session.c cvs rdiff -u -r1.6.4.4 -r1.6.4.5 src/sys/net/npf/npf_state.c cvs rdiff -u -r1.9.2.4 -r1.9.2.5 src/sys/net/npf/npf_tableset.c cvs rdiff -u -r1.4.2.5 -r1.4.2.6 src/usr.sbin/npf/npfctl/npf_build.c cvs rdiff -u -r1.10.2.4 -r1.10.2.5 src/usr.sbin/npf/npfctl/npf_data.c \ src/usr.sbin/npf/npfctl/npfctl.c cvs rdiff -u -r1.3.2.5 -r1.3.2.6 src/usr.sbin/npf/npfctl/npf_parse.y cvs rdiff -u -r1.11.2.5 -r1.11.2.6 src/usr.sbin/npf/npfctl/npfctl.h cvs rdiff -u -r0 -r1.1.2.2 src/usr.sbin/npf/npftest/README \ src/usr.sbin/npf/npftest/npftest.conf cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/usr.sbin/npf/npftest/npfstream.c cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/usr.sbin/npf/npftest/npftest.c \ src/usr.sbin/npf/npftest/npftest.h cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/usr.sbin/npf/npftest/libnpftest/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/usr.sbin/npf/npftest/libnpftest/npf_nat_test.c \ src/usr.sbin/npf/npftest/libnpftest/npf_rule_test.c cvs rdiff -u -r1.3.2.3 -r1.3.2.4 \ src/usr.sbin/npf/npftest/libnpftest/npf_test.h cvs rdiff -u -r1.1.2.3 -r1.1.2.4 \ src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.