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

Somehow Debian 6.0.7 needs ifname for IPv6 multicast connect

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42174 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-07-25 20:49:36 +00:00
parent 14dfb46b5f
commit 7f6ef1f3d6
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/rinda/test_rinda.rb
View File

@ -533,7 +533,7 @@ module RingIPv6
next unless ifaddr.addr.ipv6_linklocal? next unless ifaddr.addr.ipv6_linklocal?
next if ifaddr.name[0, 2] == "lo" next if ifaddr.name[0, 2] == "lo"
r.multicast_interface = ifaddr.ifindex r.multicast_interface = ifaddr.ifindex
return return ifaddr
end end
rescue NotImplementedError rescue NotImplementedError
# ifindex() function may not be implemented on Windows. # ifindex() function may not be implemented on Windows.
@ -663,8 +663,13 @@ class TestRingFinger < Test::Unit::TestCase
end end
def test_make_socket_ipv6_multicast def test_make_socket_ipv6_multicast
prepare_ipv6(@rf) ifaddr = prepare_ipv6(@rf)
v6mc = @rf.make_socket('ff02::1') begin
v6mc = @rf.make_socket("ff02::1")
rescue Errno::EINVAL
# somehow Debian 6.0.7 needs ifname
v6mc = @rf.make_socket("ff02::1%#{ifaddr.name}")
end
assert_equal(1, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_LOOP).int) assert_equal(1, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_LOOP).int)
assert_equal(1, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS).int) assert_equal(1, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS).int)
@ -679,7 +684,12 @@ class TestRingFinger < Test::Unit::TestCase
def test_make_socket_ipv6_multicast_hops def test_make_socket_ipv6_multicast_hops
prepare_ipv6(@rf) prepare_ipv6(@rf)
@rf.multicast_hops = 2 @rf.multicast_hops = 2
v6mc = @rf.make_socket('ff02::1') begin
v6mc = @rf.make_socket("ff02::1")
rescue Errno::EINVAL
# somehow Debian 6.0.7 needs ifname
v6mc = @rf.make_socket("ff02::1%#{ifaddr.name}")
end
assert_equal(2, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS).int) assert_equal(2, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS).int)
end end