diff options
| author | Matt Smith <mgsmith@netgate.com> | 2015-11-18 10:30:49 -0600 |
|---|---|---|
| committer | Matt Smith <mgsmith@netgate.com> | 2015-11-18 10:30:49 -0600 |
| commit | 829456fb3d26d2cee3067b5be2bbb7dcd4a646d3 (patch) | |
| tree | 14bef4885b190942be4568155a5b753997b24268 | |
| parent | 2482655555193dcbf9d3ac899143facfe1217d06 (diff) | |
| download | FreeBSD-src-829456fb3d26d2cee3067b5be2bbb7dcd4a646d3.zip FreeBSD-src-829456fb3d26d2cee3067b5be2bbb7dcd4a646d3.tar.gz | |
Importing pfSense patch pf_ifacebound_state.diff
| -rw-r--r-- | sys/netpfil/pf/pf.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 40e5eea..6a52c4e 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -343,8 +343,7 @@ do { \ return (PF_PASS); \ } while (0) -#define BOUND_IFACE(r, k) \ - ((r)->rule_flag & PFRULE_IFBOUND) ? (k) : V_pfi_all +#define BOUND_IFACE(r, k) k #define STATE_INC_COUNTERS(s) \ do { \ @@ -1458,7 +1457,7 @@ pf_find_state(struct pfi_kif *kif, struct pf_state_key_cmp *key, u_int dir) /* List is sorted, if-bound states before floating ones. */ TAILQ_FOREACH(s, &sk->states[idx], key_list[idx]) - if (s->kif == V_pfi_all || s->kif == kif) { + { PF_STATE_LOCK(s); PF_HASHROW_UNLOCK(kh); if (s->timeout >= PFTM_MAX) { |
