svn commit: r237053 - stable/9/sys/contrib/pf/net

[Gleb Smirnoff]

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)) {