[PATCH] Fallback to ipv4 if we try to add join IPv4 multicast group via ipv4-mapped address.

[Dmitry Baryshkov]

Signed-off-by: Dmitry Baryshkov <[EMAIL PROTECTED]>

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index ae98818..c70a87d 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -38,6 +38,7 @@
 #include <linux/times.h>
 #include <linux/net.h>
 #include <linux/in.h>
+#include <linux/igmp.h>
 #include <linux/in6.h>
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
@@ -183,6 +184,17 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, struct 
in6_addr *addr)
        struct ipv6_mc_socklist *mc_lst;
        struct ipv6_pinfo *np = inet6_sk(sk);
        int err;
+       int addr_type = ipv6_addr_type(addr);
+
+       if (addr_type == IPV6_ADDR_MAPPED) {
+               __be32 v4addr = addr->s6_addr32[3];
+               struct ip_mreqn mreq;
+               mreq.imr_multiaddr.s_addr = v4addr;
+               mreq.imr_address.s_addr = INADDR_ANY;
+               mreq.imr_ifindex = ifindex;
+
+               return ip_mc_join_group(sk, &mreq);
+       }
 
        if (!ipv6_addr_is_multicast(addr))
                return -EINVAL;
@@ -256,6 +268,18 @@ int ipv6_sock_mc_drop(struct sock *sk, int ifindex, struct 
in6_addr *addr)
        struct ipv6_pinfo *np = inet6_sk(sk);
        struct ipv6_mc_socklist *mc_lst, **lnk;
 
+       int addr_type = ipv6_addr_type(addr);
+
+       if (addr_type == IPV6_ADDR_MAPPED) {
+               __be32 v4addr = addr->s6_addr32[3];
+               struct ip_mreqn mreq;
+               mreq.imr_multiaddr.s_addr = v4addr;
+               mreq.imr_address.s_addr = INADDR_ANY;
+               mreq.imr_ifindex = ifindex;
+
+               return ip_mc_leave_group(sk, &mreq);
+       }
+
        write_lock_bh(&ipv6_sk_mc_lock);
        for (lnk = &np->ipv6_mc_list; (mc_lst = *lnk) !=NULL ; lnk = 
&mc_lst->next) {
                if ((ifindex == 0 || mc_lst->ifindex == ifindex) &&

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html