From owner-cvs-src-old@FreeBSD.ORG Thu Jul 28 10:13:31 2011 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 5ED20106564A for ; Thu, 28 Jul 2011 10:13:31 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 337148FC15 for ; Thu, 28 Jul 2011 10:13:31 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p6SADVi0079166 for ; Thu, 28 Jul 2011 10:13:31 GMT (envelope-from ae@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p6SADVgb079163 for cvs-src-old@freebsd.org; Thu, 28 Jul 2011 10:13:31 GMT (envelope-from ae@repoman.freebsd.org) Message-Id: <201107281013.p6SADVgb079163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to ae@repoman.freebsd.org using -f From: "Andrey V. Elsukov" Date: Thu, 28 Jul 2011 10:10:39 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 Subject: cvs commit: src/sbin/ipfw ipfw.8 ipfw2.c ipfw2.h nat.c src/sys/netinet/ipfw ip_fw2.c ip_fw_nat.c src/sys/netinet/libalias alias.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, 28 Jul 2011 10:13:31 -0000 ae 2011-07-28 10:10:39 UTC FreeBSD src repository Modified files: (Branch: RELENG_8) sbin/ipfw ipfw.8 ipfw2.c ipfw2.h nat.c sys/netinet/ipfw ip_fw2.c ip_fw_nat.c sys/netinet/libalias alias.h Log: SVN rev 224473 on 2011-07-28 10:10:39Z by ae MFC r223080: Implement "global" mode for ipfw nat. It is similar to natd(8) "globalport" option for multiple NAT instances. If ipfw rule contains "global" keyword instead of nat_number, then for each outgoing packet ipfw_nat looks up translation state in all configured nat instances. If an entry is found, packet aliased according to that entry, otherwise packet is passed unchanged. User can specify "skip_global" option in NAT configuration to exclude an instance from the lookup in global mode. PR: kern/157867 Submitted by: Alexander V. Chernikov (previous version) Revision Changes Path 1.231.2.6 +22 -1 src/sbin/ipfw/ipfw.8 1.149.2.9 +13 -5 src/sbin/ipfw/ipfw2.c 1.9.2.4 +1 -0 src/sbin/ipfw/ipfw2.h 1.4.2.4 +9 -1 src/sbin/ipfw/nat.c 1.11.2.16 +7 -0 src/sys/netinet/ipfw/ip_fw2.c 1.5.2.6 +41 -8 src/sys/netinet/ipfw/ip_fw_nat.c 1.35.2.2 +6 -0 src/sys/netinet/libalias/alias.h