* ext/socket/socket.c (addrinfo_ip_unpack): new method

  AddrInfo#ip_unpack.
  (addrinfo_unix_path): new method AddrInfo#unix_path.
  (Init_socket): define above methods.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21468 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 88e08d55d..d205a7671 100644
--- a/test/socket/test_addrinfo.rb
+++ b/test/socket/test_addrinfo.rb
@@ -25,6 +25,11 @@ class TestSocketAddrInfo < Test::Unit::TestCase
     assert_includes([0, Socket::IPPROTO_UDP], ai.protocol)
   end
 
+  def test_addrinfo_ip_unpack
+    ai = AddrInfo.tcp("127.0.0.1", 80)
+    assert_equal(["127.0.0.1", 80], ai.ip_unpack)
+  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))
@@ -266,6 +271,11 @@ class TestSocketAddrInfo < Test::Unit::TestCase
       assert_equal(0, ai.protocol)
     end
 
+    def test_addrinfo_ip_unpack_inet6
+      ai = AddrInfo.tcp("::1", 80)
+      assert_equal(["::1", 80], ai.ip_unpack)
+    end
+
   end
 
   if defined?(UNIXSocket) && /cygwin/ !~ RUBY_PLATFORM
@@ -279,6 +289,11 @@ class TestSocketAddrInfo < Test::Unit::TestCase
       assert_equal(0, ai.protocol)
     end
 
+    def test_addrinfo_unix_path
+      ai = AddrInfo.unix("/tmp/sock1")
+      assert_equal("/tmp/sock1", ai.unix_path)
+    end
+
     def test_addrinfo_new_unix
       ai = AddrInfo.new(["AF_UNIX", "/tmp/sock"])
       assert_equal("/tmp/sock", Socket.unpack_sockaddr_un(ai))