From owner-cvs-src-old@FreeBSD.ORG Tue Mar 23 10:04:51 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3833106564A for ; Tue, 23 Mar 2010 10:04:51 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A03658FC0C for ; Tue, 23 Mar 2010 10:04:51 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2NA4pWC001925 for ; Tue, 23 Mar 2010 10:04:51 GMT (envelope-from luigi@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2NA4pC8001924 for cvs-src-old@freebsd.org; Tue, 23 Mar 2010 10:04:51 GMT (envelope-from luigi@repoman.freebsd.org) Message-Id: <201003231004.o2NA4pC8001924@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to luigi@repoman.freebsd.org using -f From: Luigi Rizzo Date: Tue, 23 Mar 2010 09:58:59 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 Subject: cvs commit: src/sbin/ipfw Makefile altq.c dummynet.c ipfw.8 ipfw2.c ipfw2.h main.c src/sys/conf files src/sys/net if_bridge.c if_ethersubr.c radix.c radix.h route.c src/sys/netgraph ng_ipfw.c ng_ipfw.h src/sys/netinet in.h ip_divert.c ip_divert.h ... X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2010 10:04:51 -0000 luigi 2010-03-23 09:58:59 UTC FreeBSD src repository Modified files: (Branch: RELENG_8) sbin/ipfw Makefile altq.c dummynet.c ipfw.8 ipfw2.c ipfw2.h main.c sys/conf files sys/net if_bridge.c if_ethersubr.c radix.c radix.h route.c sys/netgraph ng_ipfw.c ng_ipfw.h sys/netinet in.h ip_divert.c ip_divert.h ip_dummynet.h ip_fw.h ip_var.h raw_ip.c sys/netinet/ipfw ip_dummynet.c ip_fw2.c ip_fw_nat.c ip_fw_pfil.c Added files: (Branch: RELENG_8) sys/netinet/ipfw dn_heap.c dn_heap.h dn_sched.h dn_sched_fifo.c dn_sched_qfq.c dn_sched_rr.c dn_sched_wf2q.c dummynet.txt ip_dn_glue.c ip_dn_io.c ip_dn_private.h ip_fw_dynamic.c ip_fw_log.c ip_fw_private.h ip_fw_sockopt.c ip_fw_table.c sys/netinet/ipfw/test Makefile dn_test.h main.c mylist.h test_dn_heap.c test_dn_sched.c Log: SVN rev 205511 on 2010-03-23 09:58:59Z by luigi MFC of a large number of ipfw and dummynet fixes and enhancements done in CURRENT over the last 4 months. HEAD and RELENG_8 are almost in sync now for ipfw, dummynet the pfil hooks and related components. Among the most noticeable changes: - r200855 more efficient lookup of skipto rules, and remove O(N) blocks from critical sections in the kernel; - r204591 large restructuring of the dummynet module, with support for multiple scheduling algorithms (4 available so far) See the original commit logs for details. Changes in the kernel/userland ABI should be harmless because the kernel is able to understand previous requests from RELENG_8 and RELENG_7. For this reason, this changeset would be applicable to RELENG_7 as well, but i am not sure if it is worthwhile. Revision Changes Path 1.21.2.2 +1 -0 src/sbin/ipfw/Makefile 1.2.2.2 +1 -0 src/sbin/ipfw/altq.c 1.9.2.4 +628 -331 src/sbin/ipfw/dummynet.c 1.231.2.3 +189 -75 src/sbin/ipfw/ipfw.8 1.149.2.4 +214 -149 src/sbin/ipfw/ipfw2.c 1.9.2.2 +23 -8 src/sbin/ipfw/ipfw2.h 1.3.2.2 +117 -41 src/sbin/ipfw/main.c 1.1459.2.18 +11 -0 src/sys/conf/files 1.131.2.5 +21 -13 src/sys/net/if_bridge.c 1.270.2.3 +19 -13 src/sys/net/if_ethersubr.c 1.42.2.2 +36 -22 src/sys/net/radix.c 1.28.2.2 +2 -1 src/sys/net/radix.h 1.167.2.6 +8 -1 src/sys/net/route.c 1.12.2.2 +21 -30 src/sys/netgraph/ng_ipfw.c 1.3.2.2 +3 -21 src/sys/netgraph/ng_ipfw.h 1.110.2.4 +26 -0 src/sys/netinet/in.h 1.156.2.3 +47 -43 src/sys/netinet/ip_divert.c 1.4.22.3 +15 -48 src/sys/netinet/ip_divert.h 1.47.2.2 +182 -315 src/sys/netinet/ip_dummynet.h 1.132.2.4 +17 -141 src/sys/netinet/ip_fw.h 1.115.2.3 +44 -3 src/sys/netinet/ip_var.h 1.2.2.2 +550 -0 src/sys/netinet/ipfw/dn_heap.c (new) 1.2.2.2 +191 -0 src/sys/netinet/ipfw/dn_heap.h (new) 1.2.2.2 +189 -0 src/sys/netinet/ipfw/dn_sched.h (new) 1.1.2.2 +120 -0 src/sys/netinet/ipfw/dn_sched_fifo.c (new) 1.1.2.2 +864 -0 src/sys/netinet/ipfw/dn_sched_qfq.c (new) 1.1.2.2 +307 -0 src/sys/netinet/ipfw/dn_sched_rr.c (new) 1.1.2.2 +373 -0 src/sys/netinet/ipfw/dn_sched_wf2q.c (new) 1.1.2.2 +860 -0 src/sys/netinet/ipfw/dummynet.txt (new) 1.2.2.2 +845 -0 src/sys/netinet/ipfw/ip_dn_glue.c (new) 1.2.2.2 +788 -0 src/sys/netinet/ipfw/ip_dn_io.c (new) 1.3.2.2 +402 -0 src/sys/netinet/ipfw/ip_dn_private.h (new) 1.5.2.3 +1918 -1968 src/sys/netinet/ipfw/ip_dummynet.c 1.11.2.8 +1578 -4084 src/sys/netinet/ipfw/ip_fw2.c 1.8.2.2 +1244 -0 src/sys/netinet/ipfw/ip_fw_dynamic.c (new) 1.9.2.2 +435 -0 src/sys/netinet/ipfw/ip_fw_log.c (new) 1.5.2.2 +220 -271 src/sys/netinet/ipfw/ip_fw_nat.c 1.4.2.4 +205 -363 src/sys/netinet/ipfw/ip_fw_pfil.c 1.13.2.2 +301 -0 src/sys/netinet/ipfw/ip_fw_private.h (new) 1.14.2.2 +1287 -0 src/sys/netinet/ipfw/ip_fw_sockopt.c (new) 1.9.2.2 +286 -0 src/sys/netinet/ipfw/ip_fw_table.c (new) 1.2.2.2 +50 -0 src/sys/netinet/ipfw/test/Makefile (new) 1.3.2.2 +175 -0 src/sys/netinet/ipfw/test/dn_test.h (new) 1.1.2.2 +636 -0 src/sys/netinet/ipfw/test/main.c (new) 1.2.2.2 +49 -0 src/sys/netinet/ipfw/test/mylist.h (new) 1.1.2.2 +162 -0 src/sys/netinet/ipfw/test/test_dn_heap.c (new) 1.2.2.2 +89 -0 src/sys/netinet/ipfw/test/test_dn_sched.c (new) 1.220.2.7 +7 -3 src/sys/netinet/raw_ip.c