[vlc-commits] src: correctly honour source specific IP addresses in IGMPv3 requests on OS X (close #6524)

[Felix Paul Kühne]

vlc/vlc-2.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Jul 12 12:14:39 2014 +0200| [8f3cd494cf9eb1cd9e9da4426ae61d6edfda4285] | committer: Felix Paul Kühne

src: correctly honour source specific IP addresses in IGMPv3 requests on OS X (close #6524)

(cherry picked from commit afee3b6775d07e0319002106a5deeb991de89abe)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=8f3cd494cf9eb1cd9e9da4426ae61d6edfda4285
---

 src/network/udp.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/network/udp.c b/src/network/udp.c
index ce4e419..b2c8a50 100644
--- a/src/network/udp.c
+++ b/src/network/udp.c
@@ -294,7 +294,9 @@ net_SourceSubscribe (vlc_object_t *obj, int fd,
                      const struct sockaddr *src, socklen_t srclen,
                      const struct sockaddr *grp, socklen_t grplen)
 {
-#ifdef MCAST_JOIN_SOURCE_GROUP
+/* MCAST_JOIN_SOURCE_GROUP was introduced to OS X in v10.7, but it doesn't work,
+ * so ignore it to use the same code path as on 10.5 or 10.6 */
+#if defined (MCAST_JOIN_SOURCE_GROUP) && !defined (__APPLE__)
     /* Agnostic SSM multicast join */
     int level;
     struct group_source_req gsr;