Module Name: src Committed By: martin Date: Fri Aug 29 11:14:14 UTC 2014
Modified Files: src/lib/libnpf [netbsd-7]: npf.c src/sys/net/npf [netbsd-7]: npf_alg.c npf_conn.c npf_ctl.c npf_impl.h npf_nat.c src/usr.sbin/npf/npfctl [netbsd-7]: npfctl.c Log Message: Pull up following revision(s) (requested by rmind in ticket #56): sys/net/npf/npf_ctl.c: revision 1.39 usr.sbin/npf/npfctl/npfctl.c: revision 1.43 lib/libnpf/npf.c: revision 1.33 lib/libnpf/npf.c: revision 1.34 sys/net/npf/npf_impl.h: revision 1.59 sys/net/npf/npf_ctl.c: revision 1.40 sys/net/npf/npf_conn.c: revision 1.11 sys/net/npf/npf_alg.c: revision 1.15 sys/net/npf/npf_conn.c: revision 1.12 sys/net/npf/npf_nat.c: revision 1.33 sys/net/npf/npf_nat.c: revision 1.34 Add and use npf_alg_export(). npf_conn_import: handle NAT metadata correctly. npf_nat_newpolicy: restore the policy ID. npfctl_load: fix error code handling for the limit cases. npf_config_import: fix the inverted logic. npfctl_load: improve error handling. npf_conn_import: add a missing stat counter increment. npf_nat_import: add a missing reference and make a comment. npf_config_submit: finally, include the saved connections. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.32.2.1 src/lib/libnpf/npf.c cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/net/npf/npf_alg.c cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/net/npf/npf_conn.c cvs rdiff -u -r1.38 -r1.38.2.1 src/sys/net/npf/npf_ctl.c cvs rdiff -u -r1.58 -r1.58.2.1 src/sys/net/npf/npf_impl.h cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/net/npf/npf_nat.c cvs rdiff -u -r1.42 -r1.42.2.1 src/usr.sbin/npf/npfctl/npfctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.