From owner-cvs-src-old@FreeBSD.ORG  Fri Jul  8 14:30:26 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 6E4B010656D6
	for <cvs-src-old@freebsd.org>; Fri,  8 Jul 2011 14:30:26 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B7F88FC12
	for <cvs-src-old@freebsd.org>; Fri,  8 Jul 2011 14:30:26 +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 p68EUQ5I093257
	for <cvs-src-old@freebsd.org>; Fri, 8 Jul 2011 14:30:26 GMT
	(envelope-from glebius@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p68EUQ20093256
	for cvs-src-old@freebsd.org; Fri, 8 Jul 2011 14:30:26 GMT
	(envelope-from glebius@repoman.freebsd.org)
Message-Id: <201107081430.p68EUQ20093256@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	glebius@repoman.freebsd.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 8 Jul 2011 14:30:06 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
Subject: cvs commit: src/sys/netgraph ng_nat.c src/sys/netinet ip_fw.h
 src/sys/netinet/ipfw ip_fw_nat.c ip_fw_private.h
 src/sys/netinet/libalias alias_db.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
	<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: Fri, 08 Jul 2011 14:30:26 -0000

glebius     2011-07-08 14:30:06 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_8)
    sys/netgraph         ng_nat.c 
    sys/netinet          ip_fw.h 
    sys/netinet/ipfw     ip_fw_nat.c ip_fw_private.h 
    sys/netinet/libalias alias_db.c 
  Log:
  SVN rev 223872 on 2011-07-08 14:30:06Z by glebius
  
  Merge from head/ 220800,220837,220914:
  
  Log:
    LibAliasInit() should allocate memory with M_WAITOK flag. Modify it
    and its callers.
  
  Log:
    - Rewrite functions that copyin/out NAT configuration, so that they
      calculate required memory size dynamically.
    - Fix races on chain re-lock.
    - Introduce new field to ip_fw_chain - generation count. Now utilized
      only in the NAT configuration, but can be utilized wider in ipfw.
    - Get rid of NAT_BUF_LEN in ip_fw.h
  
    PR:           kern/143653
  
  Revision   Changes    Path
  1.13.2.3   +0 -4      src/sys/netgraph/ng_nat.c
  1.132.2.5  +0 -2      src/sys/netinet/ip_fw.h
  1.5.2.5    +77 -63    src/sys/netinet/ipfw/ip_fw_nat.c
  1.13.2.4   +1 -0      src/sys/netinet/ipfw/ip_fw_private.h
  1.77.2.3   +5 -0      src/sys/netinet/libalias/alias_db.c