From owner-cvs-src-old@FreeBSD.ORG Mon Mar 15 17:29:48 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 C1FE9106566C for ; Mon, 15 Mar 2010 17:29:48 +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 930308FC1A for ; Mon, 15 Mar 2010 17:29:48 +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 o2FHTmqU072425 for ; Mon, 15 Mar 2010 17:29:48 GMT (envelope-from luigi@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2FHTm7T072424 for cvs-src-old@freebsd.org; Mon, 15 Mar 2010 17:29:48 GMT (envelope-from luigi@repoman.freebsd.org) Message-Id: <201003151729.o2FHTm7T072424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to luigi@repoman.freebsd.org using -f From: Luigi Rizzo Date: Mon, 15 Mar 2010 17:14:27 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sbin/ipfw dummynet.c src/sys/netinet ip_fw.h src/sys/netinet/ipfw ip_dn_io.c ip_dn_private.h ip_dummynet.c ip_fw2.c ip_fw_dynamic.c ip_fw_log.c 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: Mon, 15 Mar 2010 17:29:48 -0000 luigi 2010-03-15 17:14:27 UTC FreeBSD src repository Modified files: sbin/ipfw dummynet.c sys/netinet ip_fw.h sys/netinet/ipfw ip_dn_io.c ip_dn_private.h ip_dummynet.c ip_fw2.c ip_fw_dynamic.c ip_fw_log.c Log: SVN rev 205173 on 2010-03-15 17:14:27Z by luigi + implement (two lines) the kernel side of 'lookup dscp N' to use the dscp as a search key in table lookups; + (re)implement a sysctl variable to control the expire frequency of pipes and queues when they become empty; + add 'queue number' as optional part of the flow_id. This can be enabled with the command queue X config mask queue ... and makes it possible to support priority-based schedulers, where packets should be grouped according to the priority and not some fields in the 5-tuple. This is implemented as follows: - redefine a field in the ipfw_flow_id (in sys/netinet/ip_fw.h) but without changing the size or shape of the structure, so there are no ABI changes. On passing, also document how other fields are used, and remove some useless assignments in ip_fw2.c - implement small changes in the userland code to set/read the field; - revise the functions in ip_dummynet.c to manipulate masks so they also handle the additional field; There are no ABI changes in this commit. Revision Changes Path 1.17 +13 -4 src/sbin/ipfw/dummynet.c 1.138 +9 -6 src/sys/netinet/ip_fw.h 1.2 +9 -2 src/sys/netinet/ipfw/ip_dn_io.c 1.3 +5 -1 src/sys/netinet/ipfw/ip_dn_private.h 1.27 +30 -22 src/sys/netinet/ipfw/ip_dummynet.c 1.42 +14 -7 src/sys/netinet/ipfw/ip_fw2.c 1.8 +1 -1 src/sys/netinet/ipfw/ip_fw_dynamic.c 1.9 +1 -1 src/sys/netinet/ipfw/ip_fw_log.c