From owner-cvs-src-old@FreeBSD.ORG  Tue Jun 14 13:35:57 2011
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
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 5744B1065677
	for <cvs-src-old@freebsd.org>; Tue, 14 Jun 2011 13:35:57 +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 44A2F8FC18
	for <cvs-src-old@freebsd.org>; Tue, 14 Jun 2011 13:35:57 +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 p5EDZvXv085106
	for <cvs-src-old@freebsd.org>; Tue, 14 Jun 2011 13:35:57 GMT
	(envelope-from ae@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p5EDZvPF085105
	for cvs-src-old@freebsd.org; Tue, 14 Jun 2011 13:35:57 GMT
	(envelope-from ae@repoman.freebsd.org)
Message-Id: <201106141335.p5EDZvPF085105@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	ae@repoman.freebsd.org using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Tue, 14 Jun 2011 13:35:24 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
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
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jun 2011 13:35:57 -0000

ae          2011-06-14 13:35:24 UTC

  FreeBSD src repository

  Modified files:
    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 223080 on 2011-06-14 13:35:24Z by ae
  
  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)
  Tested by:      Eugene Grosbein
  
  Revision  Changes    Path
  1.247     +22 -1     src/sbin/ipfw/ipfw.8
  1.164     +13 -5     src/sbin/ipfw/ipfw2.c
  1.16      +1 -0      src/sbin/ipfw/ipfw2.h
  1.9       +9 -1      src/sbin/ipfw/nat.c
  1.58      +7 -0      src/sys/netinet/ipfw/ip_fw2.c
  1.20      +41 -8     src/sys/netinet/ipfw/ip_fw_nat.c
  1.37      +6 -0      src/sys/netinet/libalias/alias.h