From 34581532ff90f57268066ab0436148b8eae47177 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 22 Mar 2006 13:56:33 -0800 Subject: [PATCH] --- yaml --- r: 22871 b: refs/heads/master c: 81fbfd6925c064b764cb0536aed9232c7b48f6df h: refs/heads/master i: 22869: 7387be117ce9956860bae3cb8ee48076fb0fb811 22867: fbc5078bd1448e6f1ad0c308657f35b9c584edfb 22863: 773ea3a0519ae5fdcb80c28d73f2c40ec69200c0 v: v3 --- [refs] | 2 +- trunk/net/netfilter/xt_policy.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c95ec9b9127d..b5af0b059a70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9f78f9fca626875af8adc0f7366a38b8e625a0e +refs/heads/master: 81fbfd6925c064b764cb0536aed9232c7b48f6df diff --git a/trunk/net/netfilter/xt_policy.c b/trunk/net/netfilter/xt_policy.c index d57a611ae0d3..1099cb005fcc 100644 --- a/trunk/net/netfilter/xt_policy.c +++ b/trunk/net/netfilter/xt_policy.c @@ -27,9 +27,9 @@ xt_addr_cmp(const union xt_policy_addr *a1, const union xt_policy_addr *m, { switch (family) { case AF_INET: - return (a1->a4.s_addr ^ a2->a4.s_addr) & m->a4.s_addr; + return !((a1->a4.s_addr ^ a2->a4.s_addr) & m->a4.s_addr); case AF_INET6: - return ipv6_masked_addr_cmp(&a1->a6, &m->a6, &a2->a6); + return !ipv6_masked_addr_cmp(&a1->a6, &m->a6, &a2->a6); } return 0; } @@ -44,7 +44,7 @@ match_xfrm_state(struct xfrm_state *x, const struct xt_policy_elem *e, #define MATCH(x,y) (!e->match.x || ((e->x == (y)) ^ e->invert.x)) return MATCH_ADDR(saddr, smask, (union xt_policy_addr *)&x->props.saddr) && - MATCH_ADDR(daddr, dmask, (union xt_policy_addr *)&x->id.daddr.a4) && + MATCH_ADDR(daddr, dmask, (union xt_policy_addr *)&x->id.daddr) && MATCH(proto, x->id.proto) && MATCH(mode, x->props.mode) && MATCH(spi, x->id.spi) &&