From owner-cvs-all@FreeBSD.ORG  Fri Dec 30 00:50:19 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 43B7416A41F;
	Fri, 30 Dec 2005 00:50:19 +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 093C443D62;
	Fri, 30 Dec 2005 00:50:19 +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 jBU0oIrR099989;
	Fri, 30 Dec 2005 00:50:18 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from mlaier@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBU0oIXt099988;
	Fri, 30 Dec 2005 00:50:18 GMT (envelope-from mlaier)
Message-Id: <200512300050.jBU0oIXt099988@repoman.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Fri, 30 Dec 2005 00:50:18 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/contrib/pf/net pf.c pfvar.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Dec 2005 00:50:19 -0000

mlaier      2005-12-30 00:50:18 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/contrib/pf/net   pf.c pfvar.h 
  Log:
  MFC: pf.c 1.39+1.40 and pfvar.h 1.13+1.14
    Move PFSTATE_EXPIRING from sync_flags to a new local_flags.  sync_flags
    has special handling when zero.  This caused no PFSYNC_ACT_DEL message and
    thus disfunction of pfflowd and state synchronisation in general.
  
    Discovered by:  thompsa
    Good catch by:  thompsa
  
  and
  
    Only decrement the max-src-conn counter for tcp connections that reached
    "established" state.
  
    Similar to OpenBSD's rev. 1.499 by joel but not breaking ABI.
  
    Obtained from:  OpenBSD (with changes)
    Reported by:    Bruno Afonso
  
  ok reyk@
  
  Revision  Changes    Path
  1.34.2.3  +9 -2      src/sys/contrib/pf/net/pf.c
  1.11.2.2  +5 -2      src/sys/contrib/pf/net/pfvar.h