From owner-cvs-src@FreeBSD.ORG  Thu Sep  8 15:06:53 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7BE2616A41F;
	Thu,  8 Sep 2005 15:06:53 +0000 (GMT)
	(envelope-from mlaier@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4A87B43D45;
	Thu,  8 Sep 2005 15:06:53 +0000 (GMT)
	(envelope-from mlaier@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j88F6rTS042330;
	Thu, 8 Sep 2005 15:06:53 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from mlaier@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j88F6rP4042329;
	Thu, 8 Sep 2005 15:06:53 GMT (envelope-from mlaier)
Message-Id: <200509081506.j88F6rP4042329@repoman.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Thu, 8 Sep 2005 15:06:53 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/contrib/pf/net pf.c pf_ioctl.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Sep 2005 15:06:53 -0000

mlaier      2005-09-08 15:06:53 UTC

  FreeBSD src repository

  Modified files:
    sys/contrib/pf/net   pf.c pf_ioctl.c 
  Log:
  Commit imported changes to HEAD:
   pf_ioctl.c Revision 1.153 Sun Aug 7 11:37:33 2005 UTC by dhartmei
   | verify ticket in DIOCADDADDR, from Boris Polevoy, ok deraadt@
  
   pf_ioctl.c Revision 1.158 Mon Sep 5 14:51:08 2005 UTC by dhartmei
   | in DIOCCHANGERULE, properly initialize table, if used in NAT rule.
   | from Boris Polevoy <vapcom at mail dot ru>, ok mcbride@
  
   pf.c Revision 1.502 Mon Aug 22 11:54:25 2005 UTC by dhartmei
   | when nat'ing icmp 'connections', replace icmp id with proxy values
   | (similar to proxy ports for tcp/udp). not all clients use
   | per-invokation random ids, this allows multiple concurrent
   | connections from such clients.
   | thanks for testing to Rod Whitworth, "looks ok" markus@
  
   pf.c Revision 1.501 Mon Aug 22 09:48:05 2005 UTC by dhartmei
   | fix rdr to bitmask replacement address pool. patch from Max Laier,
   | reported by Boris Polevoy, tested by Jean Debogue, ok henning@
  
  Obtained from:  OpenBSD
  MFC after:      3 days
  
  Revision  Changes    Path
  1.36      +60 -21    src/sys/contrib/pf/net/pf.c
  1.21      +7 -0      src/sys/contrib/pf/net/pf_ioctl.c