From: Bart De Schuymer <bdschuym@pandora•be>
To: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6•org>
Cc: bart.de.schuymer@pandora•be, kaber@trash•net,
davem@davemloft•net, ebtables-devel@lists•sourceforge.net,
netfilter-devel@vger•kernel.org, netdev@vger•kernel.org
Subject: Re: [PATCH net-2.6] netfilter: ebt_ip6: Use ipv6_masked_addr_cmp().
Date: Mon, 08 Mar 2010 09:25:03 +0100 [thread overview]
Message-ID: <4B94B45F.4070804@pandora.be> (raw)
In-Reply-To: <201003070918.o279IXtq029570@94.43.138.210.xn.2iij.net>
YOSHIFUJI Hideaki schreef:
> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6•org>
> ---
> net/bridge/netfilter/ebt_ip6.c | 18 ++++--------------
> 1 files changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/net/bridge/netfilter/ebt_ip6.c b/net/bridge/netfilter/ebt_ip6.c
> index bbf2534..4644cc9 100644
> --- a/net/bridge/netfilter/ebt_ip6.c
> +++ b/net/bridge/netfilter/ebt_ip6.c
> @@ -35,8 +35,6 @@ ebt_ip6_mt(const struct sk_buff *skb, const struct xt_match_param *par)
> struct ipv6hdr _ip6h;
> const struct tcpudphdr *pptr;
> struct tcpudphdr _ports;
> - struct in6_addr tmp_addr;
> - int i;
>
> ih6 = skb_header_pointer(skb, 0, sizeof(_ip6h), &_ip6h);
> if (ih6 == NULL)
> @@ -44,18 +42,10 @@ ebt_ip6_mt(const struct sk_buff *skb, const struct xt_match_param *par)
> if (info->bitmask & EBT_IP6_TCLASS &&
> FWINV(info->tclass != ipv6_get_dsfield(ih6), EBT_IP6_TCLASS))
> return false;
> - for (i = 0; i < 4; i++)
> - tmp_addr.in6_u.u6_addr32[i] = ih6->saddr.in6_u.u6_addr32[i] &
> - info->smsk.in6_u.u6_addr32[i];
> - if (info->bitmask & EBT_IP6_SOURCE &&
> - FWINV((ipv6_addr_cmp(&tmp_addr, &info->saddr) != 0),
> - EBT_IP6_SOURCE))
> - return false;
> - for (i = 0; i < 4; i++)
> - tmp_addr.in6_u.u6_addr32[i] = ih6->daddr.in6_u.u6_addr32[i] &
> - info->dmsk.in6_u.u6_addr32[i];
> - if (info->bitmask & EBT_IP6_DEST &&
> - FWINV((ipv6_addr_cmp(&tmp_addr, &info->daddr) != 0), EBT_IP6_DEST))
> + if (FWINV(ipv6_masked_addr_cmp(&ih6->saddr, &info->smsk,
> + &info->saddr), EBT_IP6_SOURCE) ||
> + FWINV(ipv6_masked_addr_cmp(&ih6->daddr, &info->dmsk,
> + &info->daddr), EBT_IP6_DEST))
> return false;
> if (info->bitmask & EBT_IP6_PROTO) {
> uint8_t nexthdr = ih6->nexthdr;
>
Signed-off-by: Bart De Schuymer <bdschuym@pandora•be>
Looks OK to me.
cheers,
Bart
--
Bart De Schuymer
www.artinalgorithms.be
next prev parent reply other threads:[~2010-03-08 8:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-07 8:39 [PATCH net-2.6] netfilter: ebt_ip6: Use ipv6_masked_addr_cmp() YOSHIFUJI Hideaki
2010-03-07 23:27 ` David Miller
2010-03-08 8:25 ` Bart De Schuymer [this message]
2010-03-08 12:16 ` Patrick McHardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B94B45F.4070804@pandora.be \
--to=bdschuym@pandora$(echo .)be \
--cc=bart.de.schuymer@pandora$(echo .)be \
--cc=davem@davemloft$(echo .)net \
--cc=ebtables-devel@lists$(echo .)sourceforge.net \
--cc=kaber@trash$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=netfilter-devel@vger$(echo .)kernel.org \
--cc=yoshfuji@linux-ipv6$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox