From owner-cvs-src@FreeBSD.ORG Tue Dec 13 12:16:04 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 357CC16A420; Tue, 13 Dec 2005 12:16:04 +0000 (GMT) (envelope-from glebius@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF16E43D49; Tue, 13 Dec 2005 12:16:03 +0000 (GMT) (envelope-from glebius@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBDCG3no042137; Tue, 13 Dec 2005 12:16:03 GMT (envelope-from glebius@repoman.freebsd.org) Received: (from glebius@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBDCG3FJ042136; Tue, 13 Dec 2005 12:16:03 GMT (envelope-from glebius) Message-Id: <200512131216.jBDCG3FJ042136@repoman.freebsd.org> From: Gleb Smirnoff Date: Tue, 13 Dec 2005 12:16:03 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sbin/ipfw ipfw2.c src/sys/netinet ip_fw.h ip_fw2.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Dec 2005 12:16:04 -0000 glebius 2005-12-13 12:16:03 UTC FreeBSD src repository Modified files: sbin/ipfw ipfw2.c sys/netinet ip_fw.h ip_fw2.c Log: Add a new feature for optimizining ipfw rulesets - substitution of the action argument with the value obtained from table lookup. The feature is now applicable only to "pipe", "queue", "divert", "tee", "netgraph" and "ngtee" rules. An example usage: ipfw pipe 1000 config bw 1000Kbyte/s ipfw pipe 4000 config bw 4000Kbyte/s ipfw table 1 add x.x.x.x 1000 ipfw table 1 add x.x.x.y 4000 ipfw pipe tablearg ip from table(1) to any In the example above the rule will throw different packets to different pipes. TODO: - Support "skipto" action, but without searching all rules. - Improve parser, so that it warns about bad rules. These are: - "tablearg" argument to action, but no "table" in the rule. All traffic will be blocked. - "tablearg" argument to action, but "table" searches for entry with a specific value. All traffic will be blocked. - "tablearg" argument to action, and two "table" looks - for src and for dst. The last lookup will match. Revision Changes Path 1.82 +44 -46 src/sbin/ipfw/ipfw2.c 1.103 +2 -0 src/sys/netinet/ip_fw.h 1.119 +16 -5 src/sys/netinet/ip_fw2.c