Removed old resolver hacks, which are no longer useful since we now have our own fully asynchronous resolver.

Author: ioquatix

lib/rubydns.rb

@@ -21,16 +21,14 @@
 require 'rubydns/version'
 
 if RUBY_VERSION < "1.9"
-require 'rubydns/extensions/resolv-1.8'
 require 'rubydns/extensions/string-1.8'
 elsif RUBY_VERSION < "1.9.3"
-require 'rubydns/extensions/resolv-1.9'
 require 'rubydns/extensions/string-1.9.2'
 else
-require 'rubydns/extensions/resolv-1.9'
 require 'rubydns/extensions/string-1.9.3'
 end
 
+require 'rubydns/message'
 require 'rubydns/server'
 require 'rubydns/resolver'
 require 'rubydns/handler'

lib/rubydns/extensions/resolv-1.9.rb

@@ -22,31 +22,6 @@
 
 class Resolv
 class DNS
-# Queries the given DNS server and returns its response in its entirety.
-# This allows such responses to be passed upstream with little or no
-# modification/reinterpretation.
-def query(name, typeclass)
-lazy_initialize
-requester = make_requester
-senders = {}
-begin
-@config.resolv(name) {|candidate, tout, nameserver|
-msg = Message.new
-msg.rd = 1
-msg.add_question(candidate, typeclass)
-unless sender = senders[[candidate, nameserver]]
-sender = senders[[candidate, nameserver]] =
-requester.sender(msg, candidate, nameserver)
-end
-reply, reply_name = requester.request(sender, tout)
-
-return reply, reply_name
-}
-ensure
-requester.close
-end
-end
-
 class Message
 # Merge the given message with this message. A number of heuristics are
 # applied in order to ensure that the result makes sense. For example,

lib/rubydns/extensions/resolv-1.8.rb renamed to lib/rubydns/extensions/resolv.rb

@@ -22,6 +22,8 @@
 require 'stringio'
 require 'resolv'
 
+require 'rubydns/extensions/resolv'
+
 module RubyDNS
 UDP_TRUNCATION_SIZE = 512