diff options
| author | kp <kp@FreeBSD.org> | 2015-11-07 23:51:42 +0000 |
|---|---|---|
| committer | kp <kp@FreeBSD.org> | 2015-11-07 23:51:42 +0000 |
| commit | 56bf96006a33d46114e9cee6977f9dad3a78f9c4 (patch) | |
| tree | ff9a402ab227b0dbcdce1d587fb2a6ccaff2525a /sys/netpfil | |
| parent | f7f2a9334571dec4e89c7a202fb3af819d253dff (diff) | |
| download | FreeBSD-src-56bf96006a33d46114e9cee6977f9dad3a78f9c4.zip FreeBSD-src-56bf96006a33d46114e9cee6977f9dad3a78f9c4.tar.gz | |
pf: Fix broken rule skip calculation
r289932 accidentally broke the rule skip calculation. The address family
argument to PF_ANEQ() is now important, and because it was set to 0 the macro
always evaluated to false.
This resulted in incorrect skip values, which in turn broke the rule
evaluations.
Diffstat (limited to 'sys/netpfil')
| -rw-r--r-- | sys/netpfil/pf/pf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 1dfc37d..762b82e 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1973,9 +1973,9 @@ pf_addr_wrap_neq(struct pf_addr_wrap *aw1, struct pf_addr_wrap *aw2) switch (aw1->type) { case PF_ADDR_ADDRMASK: case PF_ADDR_RANGE: - if (PF_ANEQ(&aw1->v.a.addr, &aw2->v.a.addr, 0)) + if (PF_ANEQ(&aw1->v.a.addr, &aw2->v.a.addr, AF_INET6)) return (1); - if (PF_ANEQ(&aw1->v.a.mask, &aw2->v.a.mask, 0)) + if (PF_ANEQ(&aw1->v.a.mask, &aw2->v.a.mask, AF_INET6)) return (1); return (0); case PF_ADDR_DYNIFTL: |
