From owner-svn-src-stable-9@FreeBSD.ORG  Thu Jun 14 07:40:18 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CA72A106564A;
	Thu, 14 Jun 2012 07:40:18 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id B47BF8FC0C;
	Thu, 14 Jun 2012 07:40:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5E7eIFr078863;
	Thu, 14 Jun 2012 07:40:18 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5E7eIBx078861;
	Thu, 14 Jun 2012 07:40:18 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201206140740.q5E7eIBx078861@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 14 Jun 2012 07:40:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237053 - stable/9/sys/contrib/pf/net
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jun 2012 07:40:18 -0000

Author: glebius
Date: Thu Jun 14 07:40:18 2012
New Revision: 237053
URL: http://svn.freebsd.org/changeset/base/237053

Log:
  Merge r236671 from head:
    Merge revision 1.715 from OpenBSD:
  
      date: 2010/12/24 20:12:56;  author: henning;  state: Exp;  lines: +3 -3
      in pf_src_connlimit, the indices to sk->addr were swapped.
      tracked down and diff sent by Robert B Mills <rbmills at sdf.lonestar.org>
      thanks, very good work! ok claudio
  
    Impact is that the "flush" keyword didn't work.
  
    Obtained from:        OpenBSD

Modified:
  stable/9/sys/contrib/pf/net/pf.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)

Modified: stable/9/sys/contrib/pf/net/pf.c
==============================================================================
--- stable/9/sys/contrib/pf/net/pf.c	Thu Jun 14 07:12:41 2012	(r237052)
+++ stable/9/sys/contrib/pf/net/pf.c	Thu Jun 14 07:40:18 2012	(r237053)
@@ -643,10 +643,10 @@ pf_src_connlimit(struct pf_state **state
 				    (*state)->key[PF_SK_WIRE]->af &&
 				    (((*state)->direction == PF_OUT &&
 				    PF_AEQ(&(*state)->src_node->addr,
-					&sk->addr[0], sk->af)) ||
+					&sk->addr[1], sk->af)) ||
 				    ((*state)->direction == PF_IN &&
 				    PF_AEQ(&(*state)->src_node->addr,
-					&sk->addr[1], sk->af))) &&
+					&sk->addr[0], sk->af))) &&
 				    ((*state)->rule.ptr->flush &
 				    PF_FLUSH_GLOBAL ||
 				    (*state)->rule.ptr == st->rule.ptr)) {