* lib/resolv.rb (Resolv::DNS.bind_random_port): bind to "::" for IPv6.

  (Resolv::DNS::ConnectedUDP#initialize): specify is_ipv6 argument of
  bind_random_port.
  [ruby-core:25970]


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

2 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 1a007b1751..0867e41439 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Oct  7 00:27:01 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS.bind_random_port): bind to "::" for IPv6.
+	  (Resolv::DNS::ConnectedUDP#initialize): specify is_ipv6 argument of
+	  bind_random_port.
+	  [ruby-core:25970]
+
 Tue Oct  6 06:26:00 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* * ext/tk/lib/tk/canvas.rb: *** POTENTIALLY INCOMPATIBLE ***
diff --git a/lib/resolv.rb b/lib/resolv.rb
index 2f772629b1..c71559d4f3 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -592,10 +592,10 @@ class Resolv
       }
     end
 
-    def self.bind_random_port(udpsock) # :nodoc:
+    def self.bind_random_port(udpsock, is_ipv6=false) # :nodoc:
       begin
         port = rangerand(1024..65535)
-        udpsock.bind("", port)
+        udpsock.bind(is_ipv6 ? "::" : "", port)
       rescue Errno::EADDRINUSE
         retry
       end
@@ -692,8 +692,9 @@ class Resolv
           super()
           @host = host
           @port = port
-          @sock = UDPSocket.new(host.index(':') ? Socket::AF_INET6 : Socket::AF_INET)
-          DNS.bind_random_port(@sock)
+          is_ipv6 = host.index(':')
+          @sock = UDPSocket.new(is_ipv6 ? Socket::AF_INET6 : Socket::AF_INET)
+          DNS.bind_random_port(@sock, is_ipv6)
           @sock.connect(host, port)
           @sock.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::F_SETFD
         end