Received: by mail.netbsd.org (Postfix, from userid 605) id 2378A14A29E; Thu, 5 Jul 2012 17:48:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3435814A293 for ; Thu, 5 Jul 2012 17:48:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id hnLWubVqtiSf for ; Thu, 5 Jul 2012 17:48:46 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 4A96E14A26D for ; Thu, 5 Jul 2012 17:48:46 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 230E8175DD; Thu, 5 Jul 2012 17:48:46 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Date: Thu, 5 Jul 2012 17:48:46 +0000 From: "Jeff Rizzo" Subject: CVS commit: [netbsd-6] src To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20120705174846.230E8175DD@cvs.netbsd.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Jeff Rizzo" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: riz Date: Thu Jul 5 17:48:45 UTC 2012 Modified Files: src/lib/libnpf [netbsd-6]: npf.3 npf.c npf.h src/share/man/man9 [netbsd-6]: npf_ncode.9 src/sys/net/npf [netbsd-6]: npf.h npf_handler.c npf_impl.h npf_inet.c npf_instr.c npf_nat.c npf_ncode.h npf_processor.c npf_ruleset.c npf_session.c npf_state.c npf_state_tcp.c npf_tableset.c src/usr.sbin/npf/npfctl [netbsd-6]: npf.conf.5 npf_build.c npf_data.c npf_disassemble.c npf_ncgen.c npf_parse.y npf_scan.l npfctl.8 npfctl.c npfctl.h src/usr.sbin/npf/npftest/libnpftest [netbsd-6]: npf_mbuf_subr.c npf_processor_test.c npf_state_test.c npf_table_test.c npf_test.h Log Message: Pull up following revision(s) (requested by rmind in ticket #399): sys/net/npf/npf_session.c: revision 1.14 sys/net/npf/npf_tableset.c: revision 1.12 sys/net/npf/npf_state_tcp.c: revision 1.8 usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c: revision 1.3 usr.sbin/npf/npfctl/npf_data.c: revision 1.14 sys/net/npf/npf_inet.c: revision 1.13 sys/net/npf/npf_ruleset.c: revision 1.12 sys/net/npf/npf.h: revision 1.18 usr.sbin/npf/npfctl/npf_ncgen.c: revision 1.11 usr.sbin/npf/npfctl/npfctl.8: revision 1.7 usr.sbin/npf/npfctl/npf_parse.y: revision 1.9 usr.sbin/npf/npftest/libnpftest/npf_state_test.c: revision 1.2 usr.sbin/npf/npfctl/npfctl.8: revision 1.8 sys/net/npf/npf_instr.c: revision 1.12 usr.sbin/npf/npftest/libnpftest/npf_table_test.c: revision 1.3 usr.sbin/npf/npfctl/npf.conf.5: revision 1.13 usr.sbin/npf/npfctl/npf.conf.5: revision 1.14 sys/net/npf/npf_state.c: revision 1.9 sys/net/npf/npf_processor.c: revision 1.11 usr.sbin/npf/npfctl/npfctl.c: revision 1.13 usr.sbin/npf/npfctl/npfctl.c: revision 1.14 usr.sbin/npf/npfctl/npf_build.c: revision 1.10 lib/libnpf/npf.3: revision 1.5 lib/libnpf/npf.h: revision 1.8 share/man/man9/npf_ncode.9: revision 1.9 usr.sbin/npf/npfctl/npf_scan.l: revision 1.4 lib/libnpf/npf.c: revision 1.9 usr.sbin/npf/npfctl/npfctl.h: revision 1.16 sys/net/npf/npf_nat.c: revision 1.14 usr.sbin/npf/npftest/libnpftest/npf_processor_test.c: revision 1.2 usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.6 sys/net/npf/npf_impl.h: revision 1.17 sys/net/npf/npf_handler.c: revision 1.18 sys/net/npf/npf_handler.c: revision 1.19 usr.sbin/npf/npftest/libnpftest/npf_test.h: revision 1.4 sys/net/npf/npf_ncode.h: revision 1.9 Fix and update npf.conf(5), npfctl(8) and its usage message. npf_state_tcp: fix for FIN retransmission and out-of-order ACK case. NPF improvements: - Add NPF_OPCODE_PROTO to match the address and/or protocol only. - Update parser to support arbitrary "pass proto <name/number>". - Fix IPv6 address and protocol handling (add a regression test). - Fix few theorethical races in session handling module. - Misc fixes, simplifications and some clean up. npf_packet_handler: fix gcc unused warning. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.2.1 src/lib/libnpf/npf.3 cvs rdiff -u -r1.7.2.1 -r1.7.2.2 src/lib/libnpf/npf.c cvs rdiff -u -r1.6.2.1 -r1.6.2.2 src/lib/libnpf/npf.h cvs rdiff -u -r1.8 -r1.8.2.1 src/share/man/man9/npf_ncode.9 cvs rdiff -u -r1.14.2.3 -r1.14.2.4 src/sys/net/npf/npf.h cvs rdiff -u -r1.13.2.2 -r1.13.2.3 src/sys/net/npf/npf_handler.c cvs rdiff -u -r1.10.2.3 -r1.10.2.4 src/sys/net/npf/npf_impl.h cvs rdiff -u -r1.10.4.2 -r1.10.4.3 src/sys/net/npf/npf_inet.c \ src/sys/net/npf/npf_session.c cvs rdiff -u -r1.9.2.2 -r1.9.2.3 src/sys/net/npf/npf_instr.c \ src/sys/net/npf/npf_tableset.c cvs rdiff -u -r1.10.2.2 -r1.10.2.3 src/sys/net/npf/npf_nat.c cvs rdiff -u -r1.5.6.2 -r1.5.6.3 src/sys/net/npf/npf_ncode.h cvs rdiff -u -r1.9.2.1 -r1.9.2.2 src/sys/net/npf/npf_processor.c cvs rdiff -u -r1.10.2.1 -r1.10.2.2 src/sys/net/npf/npf_ruleset.c cvs rdiff -u -r1.6.4.2 -r1.6.4.3 src/sys/net/npf/npf_state.c cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/net/npf/npf_state_tcp.c cvs rdiff -u -r1.9.2.1 -r1.9.2.2 src/usr.sbin/npf/npfctl/npf.conf.5 cvs rdiff -u -r1.4.2.2 -r1.4.2.3 src/usr.sbin/npf/npfctl/npf_build.c cvs rdiff -u -r1.10.2.1 -r1.10.2.2 src/usr.sbin/npf/npfctl/npf_data.c \ src/usr.sbin/npf/npfctl/npfctl.c cvs rdiff -u -r1.3.2.3 -r1.3.2.4 src/usr.sbin/npf/npfctl/npf_disassemble.c cvs rdiff -u -r1.7.2.2 -r1.7.2.3 src/usr.sbin/npf/npfctl/npf_ncgen.c cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/usr.sbin/npf/npfctl/npf_parse.y cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/usr.sbin/npf/npfctl/npf_scan.l cvs rdiff -u -r1.6 -r1.6.6.1 src/usr.sbin/npf/npfctl/npfctl.8 cvs rdiff -u -r1.11.2.2 -r1.11.2.3 src/usr.sbin/npf/npfctl/npfctl.h cvs rdiff -u -r1.2.2.2 -r1.2.2.3 \ src/usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c cvs rdiff -u -r1.1.4.2 -r1.1.4.3 \ src/usr.sbin/npf/npftest/libnpftest/npf_processor_test.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/usr.sbin/npf/npftest/libnpftest/npf_state_test.c cvs rdiff -u -r1.2.2.3 -r1.2.2.4 \ src/usr.sbin/npf/npftest/libnpftest/npf_table_test.c cvs rdiff -u -r1.3.2.2 -r1.3.2.3 \ src/usr.sbin/npf/npftest/libnpftest/npf_test.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.