summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-20 03:25:08 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-20 03:25:08 +0000
commitf851d5dea640be815df95f7f4525c0045eb278f1 (patch)
tree50d69f3890fcc62f23466f10369789830c91608b /lib
parent781159e7ba76511b3eba266fe57e566b447cc47e (diff)
merge revision(s) 44494:
* lib/rinda/ring.rb (Rinda::RingFinger#make_socket): Use ipv4_multicast_ttl option for portability. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45060 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/rinda/ring.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb
index 4e9efadc35..2c29977d11 100644
--- a/lib/rinda/ring.rb
+++ b/lib/rinda/ring.rb
@@ -414,8 +414,7 @@ module Rinda
if addrinfo.ipv4_multicast? then
soc.setsockopt(Socket::Option.ipv4_multicast_loop(1))
- soc.setsockopt(:IPPROTO_IP, :IP_MULTICAST_TTL,
- [@multicast_hops].pack('c'))
+ soc.setsockopt(Socket::Option.ipv4_multicast_ttl(@multicast_hops))
elsif addrinfo.ipv6_multicast? then
soc.setsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_LOOP, true)
soc.setsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS,