1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/rinda/ring.rb (RingFinger#make_socket): Close the socket on exception.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-06-01 02:37:27 +00:00
parent f64541d7bd
commit 09ab3a0a9f
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Jun 1 11:36:25 2014 Tanaka Akira <akr@fsij.org>
* lib/rinda/ring.rb (RingFinger#make_socket): Close the socket on
exception.
Sun Jun 1 06:55:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Jun 1 06:55:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (intern_str): dynamic attrset ID is registered by * parse.y (intern_str): dynamic attrset ID is registered by

30
lib/rinda/ring.rb
View File

@ -413,22 +413,26 @@ module Rinda
addrinfo = Addrinfo.udp(address, @port) addrinfo = Addrinfo.udp(address, @port)
soc = Socket.new(addrinfo.pfamily, addrinfo.socktype, addrinfo.protocol) soc = Socket.new(addrinfo.pfamily, addrinfo.socktype, addrinfo.protocol)
begin
if addrinfo.ipv4_multicast? then
soc.setsockopt(Socket::Option.ipv4_multicast_loop(1))
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,
[@multicast_hops].pack('I'))
soc.setsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_IF,
[@multicast_interface].pack('I'))
else
soc.setsockopt(:SOL_SOCKET, :SO_BROADCAST, true)
end
if addrinfo.ipv4_multicast? then soc.connect(addrinfo)
soc.setsockopt(Socket::Option.ipv4_multicast_loop(1)) rescue Exception
soc.setsockopt(Socket::Option.ipv4_multicast_ttl(@multicast_hops)) soc.close
elsif addrinfo.ipv6_multicast? then raise
soc.setsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_LOOP, true)
soc.setsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS,
[@multicast_hops].pack('I'))
soc.setsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_IF,
[@multicast_interface].pack('I'))
else
soc.setsockopt(:SOL_SOCKET, :SO_BROADCAST, true)
end end
soc.connect(addrinfo)
soc soc
end end