diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2013-06-03 01:41:05 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2013-06-03 01:41:05 +0000 |
| commit | db0183e381a0ad4c0ce5ed4dce1f25acd8b27782 (patch) | |
| tree | e3a79cc6e4fb0fb0566538cddc81a1950b2a402b /sys/net/pfvar.h | |
| parent | 13026fbfd99219db371f259055808a25c5a7a874 (diff) | |
fix anchor quick with nested anchors. we lost the quick flag as soon as
we stepped into a child anchor.
simplify the logic, get rid of the match flag in the anchor stack, just
use the match variable we already had (and used in a boolean style) to track
the nest level we had a match at. when a child anchor had a match we also
have a match in the current anchor, so update the match level accordingly,
and thus correctly honour the quick flag.
reported by, along with the right idea on how to fix this, by Sean Gallagher
\sean at teletech.com.au/, who also helped testing the fix. ok ryan & benno
Diffstat (limited to 'sys/net/pfvar.h')
| -rw-r--r-- | sys/net/pfvar.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 25be4b3b2c0..36c6e4f5917 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.380 2013/06/01 21:18:02 henning Exp $ */ +/* $OpenBSD: pfvar.h,v 1.381 2013/06/03 01:41:04 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1004,7 +1004,6 @@ struct pf_anchor { char path[MAXPATHLEN]; struct pf_ruleset ruleset; int refcnt; /* anchor rules */ - int match; }; RB_PROTOTYPE(pf_anchor_global, pf_anchor, entry_global, pf_anchor_compare); RB_PROTOTYPE(pf_anchor_node, pf_anchor, entry_node, pf_anchor_compare); |