From 9851ef39f01693784e0c6489113507dbadcf8f1e Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 6 Oct 2009 15:31:22 +0000 Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@25246 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/resolv.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/resolv.rb b/lib/resolv.rb index ed8859d3c..265a4b7f0 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -599,10 +599,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 @@ -699,8 +699,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 -- cgit