apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r354955 - /apr/apr/trunk/network_io/unix/multicast.c
Date Thu, 08 Dec 2005 03:17:23 GMT
Author: pquerna
Date: Wed Dec  7 19:17:18 2005
New Revision: 354955

URL: http://svn.apache.org/viewcvs?rev=354955&view=rev
Log:
Fix multicast w/ source specific groups when compiled with --disable-ipv6.
PR: 37827

Modified:
    apr/apr/trunk/network_io/unix/multicast.c

Modified: apr/apr/trunk/network_io/unix/multicast.c
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/network_io/unix/multicast.c?rev=354955&r1=354954&r2=354955&view=diff
==============================================================================
--- apr/apr/trunk/network_io/unix/multicast.c (original)
+++ apr/apr/trunk/network_io/unix/multicast.c Wed Dec  7 19:17:18 2005
@@ -121,12 +121,17 @@
 
     if (source != NULL) {
 #if MCAST_JOIN_SOURCE_GROUP
-        if (sock_is_ipv6(sock))
+        if (sock_is_ipv4(sock)) {
             ip_proto = IPPROTO_IP;
-        else if (sock_is_ipv6(sock))
+        } 
+#if APR_HAVE_IPV6
+        else if (sock_is_ipv6(sock)) {
             ip_proto = IPPROTO_IPV6;
-        else
+        }
+#endif
+        else {
             return APR_ENOTIMPL;
+        }
 
         if (type == IP_ADD_MEMBERSHIP)
             type = MCAST_JOIN_SOURCE_GROUP;



Mime
View raw message