summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/rinda/ring.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ecab192079..23c390bded 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jan 4 10:15:47 2014 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rinda/ring.rb (Rinda::RingFinger#make_socket): Use
+ ipv4_multicast_loop option for portability. Patch by Jeremy Evans.
+ [ruby-trunk - Bug #9351]
+
Fri Jan 3 19:09:00 2014 Eric Wong <normalperson@yhbt.net>
* ext/socket/socket.c (rsock_sys_fail_host_port): save and restore errno
diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb
index 1ecc56a4f5..4e9efadc35 100644
--- a/lib/rinda/ring.rb
+++ b/lib/rinda/ring.rb
@@ -413,7 +413,7 @@ module Rinda
soc = Socket.new(addrinfo.pfamily, addrinfo.socktype, addrinfo.protocol)
if addrinfo.ipv4_multicast? then
- soc.setsockopt(:IPPROTO_IP, :IP_MULTICAST_LOOP, true)
+ soc.setsockopt(Socket::Option.ipv4_multicast_loop(1))
soc.setsockopt(:IPPROTO_IP, :IP_MULTICAST_TTL,
[@multicast_hops].pack('c'))
elsif addrinfo.ipv6_multicast? then