Fix IPv4 multicast subscription

diff --git a/include/network.h b/include/network.h
index fa64725b84da86b83d6a880cfddc5d26898b7bf8..1df133246d3654e1c138e60b44153d935b8687e1 100644 (file)
--- a/include/network.h
+++ b/include/network.h
@@ -259,7 +259,7 @@ net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len)
             struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
             if (len < sizeof (*v4))
                 return VLC_FALSE;
-            return IN_MULTICAST (v4->sin_addr.s_addr) != 0;
+            return IN_MULTICAST (ntohl (v4->sin_addr.s_addr)) != 0;
         }
 #endif
 

diff --git a/src/network/udp.c b/src/network/udp.c
index 7eb985ca6e6221162d2a4cbb68c36990c76e8a76..62c34f83205d1c825bcfba8e3dd629e5ba1895c6 100644 (file)
--- a/src/network/udp.c
+++ b/src/network/udp.c
@@ -246,6 +246,8 @@ int net_Subscribe (vlc_object_t *obj, int fd, const struct sockaddr *addr,
             imr.ipv6mr_interface = v6->sin6_scope_id;
             memcpy (&imr.ipv6mr_multiaddr, &v6->sin6_addr, 16);
 
+            msg_Dbg (obj, "IPV6_JOIN_GROUP multicast request");
+
             if (setsockopt (fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &imr,
                             sizeof (imr)))
             {