kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

don't connect to unspecified address (0.0.0.0). OpenBSD reject it.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-02-05 00:09:39 +00:00
parent 4a7a6794c1
commit 0d0fe1a5ad
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
test/socket/test_addrinfo.rb
View file

@ -8,6 +8,18 @@ require "test/unit"
class TestSocketAddrInfo < Test::Unit::TestCase class TestSocketAddrInfo < Test::Unit::TestCase
HAS_UNIXSOCKET = defined?(UNIXSocket) && /cygwin/ !~ RUBY_PLATFORM HAS_UNIXSOCKET = defined?(UNIXSocket) && /cygwin/ !~ RUBY_PLATFORM
def tcp_unspecified_to_loopback(addrinfo)
if addrinfo.ipv4? && addrinfo.ip_address == "0.0.0.0"
AddrInfo.tcp("127.0.0.1", addrinfo.ip_port)
elsif addrinfo.ipv6? && addrinfo.ipv6_unspecified?
AddrInfo.tcp("::1", addrinfo.ip_port)
elsif addrinfo.ipv6? && (ai = addrinfo.ipv6_to_ipv4) && ai.ip_address == "0.0.0.0"
AddrInfo.tcp("127.0.0.1", addrinfo.ip_port)
else
addrinfo
end
end
def test_addrinfo_ip def test_addrinfo_ip
ai = AddrInfo.ip("127.0.0.1") ai = AddrInfo.ip("127.0.0.1")
assert_equal([0, "127.0.0.1"], Socket.unpack_sockaddr_in(ai)) assert_equal([0, "127.0.0.1"], Socket.unpack_sockaddr_in(ai))
@ -319,6 +331,7 @@ class TestSocketAddrInfo < Test::Unit::TestCase
def test_connect_from def test_connect_from
TCPServer.open("0.0.0.0", 0) {|serv| TCPServer.open("0.0.0.0", 0) {|serv|
serv_ai = AddrInfo.new(serv.getsockname, :INET, :STREAM) serv_ai = AddrInfo.new(serv.getsockname, :INET, :STREAM)
serv_ai = tcp_unspecified_to_loopback(serv_ai)
port = random_port port = random_port
begin begin
serv_ai.connect_from("0.0.0.0", port) {|s1| serv_ai.connect_from("0.0.0.0", port) {|s1|
@ -338,6 +351,7 @@ class TestSocketAddrInfo < Test::Unit::TestCase
def test_connect_to def test_connect_to
TCPServer.open("0.0.0.0", 0) {|serv| TCPServer.open("0.0.0.0", 0) {|serv|
serv_ai = AddrInfo.new(serv.getsockname, :INET, :STREAM) serv_ai = AddrInfo.new(serv.getsockname, :INET, :STREAM)
serv_ai = tcp_unspecified_to_loopback(serv_ai)
port = random_port port = random_port
client_ai = AddrInfo.tcp("0.0.0.0", port) client_ai = AddrInfo.tcp("0.0.0.0", port)
begin begin
@ -358,6 +372,7 @@ class TestSocketAddrInfo < Test::Unit::TestCase
def test_connect def test_connect
TCPServer.open("0.0.0.0", 0) {|serv| TCPServer.open("0.0.0.0", 0) {|serv|
serv_ai = AddrInfo.new(serv.getsockname, :INET, :STREAM) serv_ai = AddrInfo.new(serv.getsockname, :INET, :STREAM)
serv_ai = tcp_unspecified_to_loopback(serv_ai)
begin begin
serv_ai.connect {|s1| serv_ai.connect {|s1|
s2 = serv.accept s2 = serv.accept
@ -392,7 +407,11 @@ class TestSocketAddrInfo < Test::Unit::TestCase
begin begin
client_ai.listen {|serv| client_ai.listen {|serv|
assert_equal(port, serv.local_address.ip_port) assert_equal(port, serv.local_address.ip_port)
TCPSocket.open(*serv.local_address.ip_unpack) {|s1| serv_addr, serv_port = serv.local_address.ip_unpack
case serv_addr
when "0.0.0.0" then serv_addr = "127.0.0.1"
end
TCPSocket.open(serv_addr, serv_port) {|s1|
s2, addr = serv.accept s2, addr = serv.accept
begin begin
assert_equal(s1.local_address.ip_unpack, addr.ip_unpack) assert_equal(s1.local_address.ip_unpack, addr.ip_unpack)