[PATCH] iptables: "cluster" match uses IPv6-specific code without ifdef

[PATCH] iptables: "cluster" match uses IPv6-specific code without ifdef

[Steven Noonan]

The symbol __ipv6_addr_type is only available with CONFIG_IPV6 or
CONFIG_IPV6_MODULE.

Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
---
 net/netfilter/xt_cluster.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/netfilter/xt_cluster.c b/net/netfilter/xt_cluster.c
index ad5bd89..38091f3 100644
--- a/net/netfilter/xt_cluster.c
+++ b/net/netfilter/xt_cluster.c
@@ -66,10 +66,12 @@ xt_cluster_is_multicast_addr(const struct sk_buff *skb, u_int8_t family)
 	case NFPROTO_IPV4:
 		is_multicast = ipv4_is_multicast(ip_hdr(skb)->daddr);
 		break;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 	case NFPROTO_IPV6:
 		is_multicast = ipv6_addr_type(&ipv6_hdr(skb)->daddr) &
 						IPV6_ADDR_MULTICAST;
 		break;
+#endif
 	default:
 		WARN_ON(1);
 		break;
-- 
1.6.2

Re: [PATCH] iptables: "cluster" match uses IPv6-specific code without ifdef

[Pablo Neira Ayuso]

Steven Noonan wrote:
> The symbol __ipv6_addr_type is only available with CONFIG_IPV6 or
> CONFIG_IPV6_MODULE.

Please, CC netfilter-devel for netfilter-related issues. Patrick, I'm
fine with this, can you apply this patch?

Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>

-- 
"Los honestos son inadaptados sociales" -- Les Luthiers

Re: [PATCH] iptables: "cluster" match uses IPv6-specific code without ifdef

[Patrick McHardy]

Pablo Neira Ayuso wrote:
> Steven Noonan wrote:
>> The symbol __ipv6_addr_type is only available with CONFIG_IPV6 or
>> CONFIG_IPV6_MODULE.
> 
> Please, CC netfilter-devel for netfilter-related issues. Patrick, I'm
> fine with this, can you apply this patch?

Is my reading correct that this won't introduce a module
dependency on IPv6?

Re: [PATCH] iptables: "cluster" match uses IPv6-specific code without ifdef

[Pablo Neira Ayuso]

Patrick McHardy wrote:
> Pablo Neira Ayuso wrote:
>> Steven Noonan wrote:
>>> The symbol __ipv6_addr_type is only available with CONFIG_IPV6 or
>>> CONFIG_IPV6_MODULE.
>>
>> Please, CC netfilter-devel for netfilter-related issues. Patrick, I'm
>> fine with this, can you apply this patch?
> 
> Is my reading correct that this won't introduce a module
> dependency on IPv6?

Hm, this fixes a compilation issue when IPv6 is not enabled. In that
case you can still use the cluster match, so I don't see any extra
modules dependencies.

-- 
"Los honestos son inadaptados sociales" -- Les Luthiers

Re: [PATCH] iptables: "cluster" match uses IPv6-specific code without ifdef

[Patrick McHardy]

Pablo Neira Ayuso wrote:
> Patrick McHardy wrote:
>> Pablo Neira Ayuso wrote:
>>> Steven Noonan wrote:
>>>> The symbol __ipv6_addr_type is only available with CONFIG_IPV6 or
>>>> CONFIG_IPV6_MODULE.
>>> Please, CC netfilter-devel for netfilter-related issues. Patrick, I'm
>>> fine with this, can you apply this patch?
>> Is my reading correct that this won't introduce a module
>> dependency on IPv6?
> 
> Hm, this fixes a compilation issue when IPv6 is not enabled. In that
> case you can still use the cluster match, so I don't see any extra
> modules dependencies.

That was badly phrased, sorry. The patch of course doesn't change
anything in that regard.

I'm wondering whether we have a (runtime) dependency on the ipv6
module due to the ipv6_addr_type() call. If that's the case, it
would need to be fixed as well.

Re: [PATCH] iptables: "cluster" match uses IPv6-specific code without ifdef

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]

On Fri, Mar 27, 2009 at 01:50:16PM +0100, Patrick McHardy wrote:
> Pablo Neira Ayuso wrote:
>> Patrick McHardy wrote:
>>> Pablo Neira Ayuso wrote:
>>>> Steven Noonan wrote:
>>>>> The symbol __ipv6_addr_type is only available with CONFIG_IPV6 or
>>>>> CONFIG_IPV6_MODULE.
>>>> Please, CC netfilter-devel for netfilter-related issues. Patrick, I'm
>>>> fine with this, can you apply this patch?
>>> Is my reading correct that this won't introduce a module
>>> dependency on IPv6?
>>
>> Hm, this fixes a compilation issue when IPv6 is not enabled. In that
>> case you can still use the cluster match, so I don't see any extra
>> modules dependencies.
>
> That was badly phrased, sorry. The patch of course doesn't change
> anything in that regard.
>
> I'm wondering whether we have a (runtime) dependency on the ipv6
> module due to the ipv6_addr_type() call. If that's the case, it
> would need to be fixed as well.

we don't, see my other mail (linux-next) tree.  It's provided by a function
that is always statically linked into vmlinux.

-- 
- Harald Welte <laforge@netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]