apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r372427 - /apr/apr/branches/1.2.x/network_io/unix/multicast.c
Date Thu, 26 Jan 2006 04:20:50 GMT
Author: rooneg
Date: Wed Jan 25 20:20:48 2006
New Revision: 372427

URL: http://svn.apache.org/viewcvs?rev=372427&view=rev
Log:
Merge r354955 into 1.2.x.

Original log message:

Fix multicast w/ source specific groups when compiled with --disable-ipv6.
PR: 37827

Modified:
    apr/apr/branches/1.2.x/network_io/unix/multicast.c

Modified: apr/apr/branches/1.2.x/network_io/unix/multicast.c
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/network_io/unix/multicast.c?rev=372427&r1=372426&r2=372427&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/network_io/unix/multicast.c (original)
+++ apr/apr/branches/1.2.x/network_io/unix/multicast.c Wed Jan 25 20:20:48 2006
@@ -146,12 +146,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