From owner-cvs-src-old@FreeBSD.ORG Thu Jan 7 10:39:23 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 DF9D710656BB for ; Thu, 7 Jan 2010 10:39:23 +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 CD6358FC17 for ; Thu, 7 Jan 2010 10:39:23 +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 o07AdNVl044724 for ; Thu, 7 Jan 2010 10:39:23 GMT (envelope-from luigi@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o07AdN7V044723 for cvs-src-old@freebsd.org; Thu, 7 Jan 2010 10:39:23 GMT (envelope-from luigi@repoman.freebsd.org) Message-Id: <201001071039.o07AdN7V044723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to luigi@repoman.freebsd.org using -f From: Luigi Rizzo Date: Thu, 7 Jan 2010 10:39:15 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/netinet ip_divert.c ip_var.h raw_ip.c src/sys/netinet/ipfw ip_fw_private.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: Thu, 07 Jan 2010 10:39:24 -0000 luigi 2010-01-07 10:39:15 UTC FreeBSD src repository Modified files: sys/netinet ip_divert.c ip_var.h raw_ip.c sys/netinet/ipfw ip_fw_private.h Log: SVN rev 201735 on 2010-01-07 10:39:15Z by luigi Following up on a request from Ermal Luci to make ip_divert work as a client of pf(4), make ip_divert not depend on ipfw. This is achieved by moving to ip_var.h the struct ipfw_rule_ref (which is part of the mtag for all reinjected packets) and other declarations of global variables, and moving to raw_ip.c global variables for filter and divert hooks. Note that names and locations could be made more generic (ipfw_rule_ref is really a generic reference robust to reconfigurations; the packet filter is not necessarily ipfw; filters and their clients are not necessarily limited to ipv4), but _right now_ most of this stuff works on ipfw and ipv4, so i don't feel like doing a gratuitous renaming, at least for the time being. Revision Changes Path 1.160 +20 -24 src/sys/netinet/ip_divert.c 1.117 +44 -3 src/sys/netinet/ip_var.h 1.10 +1 -47 src/sys/netinet/ipfw/ip_fw_private.h 1.226 +7 -3 src/sys/netinet/raw_ip.c