diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/resolv.rb | 14 |
2 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Jan 31 22:38:46 2009 Tanaka Akira <[email protected]> + + * lib/resolv.rb (Resolv::DNS#each_address): don't query IPv6 address + if the host has no global IPv6 address. + Sat Jan 31 22:29:05 2009 Tanaka Akira <[email protected]> * include/ruby/ruby.h (STR2CSTR): removed. diff --git a/lib/resolv.rb b/lib/resolv.rb index fc3c78215b..ab10a79d72 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -379,8 +379,20 @@ class Resolv def each_address(name) each_resource(name, Resource::IN::A) {|resource| yield resource.address} - each_resource(name, Resource::IN::AAAA) {|resource| yield resource.address} + if use_ipv6? + each_resource(name, Resource::IN::AAAA) {|resource| yield resource.address} + end + end + + def use_ipv6? + begin + list = Socket.ip_address_list + rescue NotImplementedError + return true + end + list.any? {|a| a.ipv6? && !a.ipv6_loopback? && !a.ipv6_linklocal? } end + private :use_ipv6? ## # Gets the hostname for +address+ from the DNS resolver. |