summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhenning <henning@openbsd.org>2010-12-24 20:12:56 +0000
committerhenning <henning@openbsd.org>2010-12-24 20:12:56 +0000
commitea7d1040bbc43ec3952ff5bb7c3336e341e159e4 (patch)
tree0b1449bfcc5869dffe9ca3af557bf4d11ddbf362
parentcrtbeginS.o needs to be buit with -fPIC; with -fpic the relocations for the (diff)
downloadwireguard-openbsd-ea7d1040bbc43ec3952ff5bb7c3336e341e159e4.tar.xz
wireguard-openbsd-ea7d1040bbc43ec3952ff5bb7c3336e341e159e4.zip
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
-rw-r--r--sys/net/pf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 5bd379b7f5e..c6240bd001f 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.714 2010/12/07 11:39:40 jsg Exp $ */
+/* $OpenBSD: pf.c,v 1.715 2010/12/24 20:12:56 henning Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -485,9 +485,9 @@ pf_src_connlimit(struct pf_state **state)
if (sk->af ==
(*state)->key[PF_SK_WIRE]->af &&
(((*state)->direction == PF_OUT &&
- PF_AEQ(&sn->addr, &sk->addr[0], sk->af)) ||
+ PF_AEQ(&sn->addr, &sk->addr[1], sk->af)) ||
((*state)->direction == PF_IN &&
- PF_AEQ(&sn->addr, &sk->addr[1], sk->af))) &&
+ PF_AEQ(&sn->addr, &sk->addr[0], sk->af))) &&
((*state)->rule.ptr->flush &
PF_FLUSH_GLOBAL ||
(*state)->rule.ptr == st->rule.ptr)) {