From owner-cvs-src-old@FreeBSD.ORG Mon Jan 4 19:04:24 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 7DE9D106566C for ; Mon, 4 Jan 2010 19:04:24 +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 4F56C8FC17 for ; Mon, 4 Jan 2010 19:04:24 +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 o04J4O2G020229 for ; Mon, 4 Jan 2010 19:04:24 GMT (envelope-from luigi@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o04J4OMZ020228 for cvs-src-old@freebsd.org; Mon, 4 Jan 2010 19:04:24 GMT (envelope-from luigi@repoman.freebsd.org) Message-Id: <201001041904.o04J4OMZ020228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to luigi@repoman.freebsd.org using -f From: Luigi Rizzo Date: Mon, 4 Jan 2010 19:01:22 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/net if_bridge.c if_ethersubr.c src/sys/netgraph ng_ipfw.c src/sys/netinet ip_divert.c ip_divert.h ip_dummynet.h src/sys/netinet/ipfw ip_dummynet.c ip_fw2.c ip_fw_dynamic.c ip_fw_log.c ip_fw_nat.c ip_fw_pfil.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, 04 Jan 2010 19:04:24 -0000 luigi 2010-01-04 19:01:22 UTC FreeBSD src repository Modified files: sys/net if_bridge.c if_ethersubr.c sys/netgraph ng_ipfw.c sys/netinet ip_divert.c ip_divert.h ip_dummynet.h sys/netinet/ipfw ip_dummynet.c ip_fw2.c ip_fw_dynamic.c ip_fw_log.c ip_fw_nat.c ip_fw_pfil.c ip_fw_private.h ip_fw_sockopt.c Log: SVN rev 201527 on 2010-01-04 19:01:22Z by luigi Various cleanup done in ipfw3-head branch including: - use a uniform mtag format for all packets that exit and re-enter the firewall in the middle of a rulechain. On reentry, all tags containing reinject info are renamed to MTAG_IPFW_RULE so the processing is simpler. - make ipfw and dummynet use ip_len and ip_off in network format everywhere. Conversion is done only once instead of tracking the format in every place. - use a macro FREE_PKT to dispose of mbufs. This eases portability. On passing i also removed a few typos, staticise or localise variables, remove useless declarations and other minor things. Overall the code shrinks a bit and is hopefully more readable. I have tested functionality for all but ng_ipfw and if_bridge/if_ethersubr. For ng_ipfw i am actually waiting for feedback from glebius@ because we might have some small changes to make. For if_bridge and if_ethersubr feedback would be welcome (there are still some redundant parts in these two modules that I would like to remove, but first i need to check functionality). Revision Changes Path 1.137 +10 -9 src/sys/net/if_bridge.c 1.275 +6 -7 src/sys/net/if_ethersubr.c 1.16 +19 -30 src/sys/netgraph/ng_ipfw.c 1.159 +28 -28 src/sys/netinet/ip_divert.c 1.6 +15 -48 src/sys/netinet/ip_divert.h 1.50 +1 -5 src/sys/netinet/ip_dummynet.h 1.18 +21 -23 src/sys/netinet/ipfw/ip_dummynet.c 1.38 +50 -106 src/sys/netinet/ipfw/ip_fw2.c 1.5 +1 -5 src/sys/netinet/ipfw/ip_fw_dynamic.c 1.6 +6 -22 src/sys/netinet/ipfw/ip_fw_log.c 1.12 +0 -6 src/sys/netinet/ipfw/ip_fw_nat.c 1.12 +53 -58 src/sys/netinet/ipfw/ip_fw_pfil.c 1.9 +48 -24 src/sys/netinet/ipfw/ip_fw_private.h 1.9 +2 -1 src/sys/netinet/ipfw/ip_fw_sockopt.c