* ext/socket/raddrinfo.c (addrinfo_inspect_sockaddr): new

  method AddrInfo#inspect_sockaddr.
  (inspect_sockaddr): extracted from addrinfo_inspect.
  (addrinfo_inspect): use inspect_sockaddr.
  (Init_addrinfo): define the new method.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 15 insertions, 0 deletions

diff --git a/test/socket/test_addrinfo.rb b/test/socket/test_addrinfo.rb
index 326c6f8a86..bccf2774e4 100644
--- a/test/socket/test_addrinfo.rb
+++ b/test/socket/test_addrinfo.rb
@@ -41,6 +41,11 @@ class TestSocketAddrInfo < Test::Unit::TestCase
     assert_equal(80, ai.ip_port)
   end
 
+  def test_addrinfo_inspect_sockaddr
+    ai = AddrInfo.tcp("127.0.0.1", 80)
+    assert_equal("127.0.0.1:80", ai.inspect_sockaddr)
+  end
+
   def test_addrinfo_new_inet
     ai = AddrInfo.new(["AF_INET", 46102, "localhost.localdomain", "127.0.0.2"])
     assert_equal([46102, "127.0.0.2"], Socket.unpack_sockaddr_in(ai))
@@ -305,6 +310,11 @@ class TestSocketAddrInfo < Test::Unit::TestCase
       assert_equal(80, ai.ip_port)
     end
 
+    def test_addrinfo_inspect_sockaddr_inet6
+      ai = AddrInfo.tcp("::1", 80)
+      assert_equal("[::1]:80", ai.inspect_sockaddr)
+    end
+
     def test_marshal_inet6
       ai1 = AddrInfo.tcp("::1", 80)
       ai2 = Marshal.load(Marshal.dump(ai1))
@@ -334,6 +344,11 @@ class TestSocketAddrInfo < Test::Unit::TestCase
       assert_equal("/tmp/sock1", ai.unix_path)
     end
 
+    def test_addrinfo_inspect_sockaddr_unix
+      ai = AddrInfo.unix("/tmp/test_addrinfo_inspect_sockaddr_unix")
+      assert_equal("/tmp/test_addrinfo_inspect_sockaddr_unix", ai.inspect_sockaddr)
+    end
+
     def test_addrinfo_new_unix
       ai = AddrInfo.new(["AF_UNIX", "/tmp/sock"])
       assert_equal("/tmp/sock", Socket.unpack_sockaddr_un(ai))