net-dns 0.5.3 → 0.6.0

data/lib/net/dns/names/names.rb

@@ -1,8 +1,21 @@
-module Net # :nodoc:
+module Net
   module DNS 
     
-    module Names # :nodoc: all
-
+    module Names
+      
+      # Argument Error for class Net::DNS::Names.
+      class ArgumentError < ArgumentError
+      end
+      
+      # Base error class.
+      class Error < StandardError
+      end
+      
+      # Generic Names Error.
+      class ExpandError < Error
+      end
+      
+      
       INT16SZ = 2
       
       # Expand a compressed name in a DNS Packet object. Please
@@ -18,7 +31,7 @@ module Net # :nodoc:
         name = ""
         packetlen = packet.size
         while true
-          raise ExpandError, "offset is greater than packet lenght!" if packetlen < (offset+1)
+          raise ExpandError, "Offset is greater than packet lenght!" if packetlen < (offset+1)
           len = packet.unpack("@#{offset} C")[0]
           
           if len == 0
@@ -101,9 +114,6 @@ module Net # :nodoc:
         end
       end
       
-    end # module Names
-  end # module DNS
-end # module Net
-
-class ExpandError < StandardError # :nodoc:
-end
+    end
+  end
+end

data/lib/net/dns/packet.rb

@@ -1,6 +1,6 @@
 require 'logger'
 require 'net/dns/names/names'
-require 'net/dns/dns'
+require 'net/dns'
 require 'net/dns/header'
 require 'net/dns/question'
 require 'net/dns/rr'
@@ -94,8 +94,8 @@ module Net # :nodoc:
     # which are listed here to keep a light and browsable main documentation.
     # We have:
     #
-    # * PacketArgumentError: Generic argument error for class Net::DNS::Packet
-    # * PacketError: Generic Packet error
+    # ArgumentError::   Argument Error for class Net::DNS::Packet
+    # PacketError::     Generic Packet Error
     #
     # =Copyright
     # 
@@ -105,12 +105,24 @@ module Net # :nodoc:
     # it and/or modify it under the same terms as Ruby itself.
     #
     class Packet
-
       include Names
       
+      # Argument Error for class Net::DNS::Packet.
+      class ArgumentError < ArgumentError
+      end
+      
+      # Base error class.
+      class Error < StandardError
+      end
+      
+      # Generic Packet Error.
+      class PacketError < Error
+      end
+      
+      
       attr_reader :header, :question, :answer, :authority, :additional
       attr_reader :answerfrom, :answersize
-
+      
       # Create a new instance of Net::DNS::Packet class. Arguments are the
       # canonical name of the resourse, an optional type field and an optional
       # class field. The record type and class can be omitted; they default 
@@ -305,7 +317,7 @@ module Net # :nodoc:
         if object.kind_of? Net::DNS::Header
           @header = object
         else
-          raise PacketArgumentError, "Argument must be a Net::DNS::Header object"
+          raise ArgumentError, "Argument must be a Net::DNS::Header object"
         end
       end
       
@@ -318,12 +330,12 @@ module Net # :nodoc:
           if object.all? {|x| x.kind_of? Net::DNS::Question}
             @question = object
           else
-            raise PacketArgumentError, "Some of the elements is not an Net::DNS::Question object"
+            raise ArgumentError, "Some of the elements is not an Net::DNS::Question object"
           end
         when Net::DNS::Question
           @question = [object]
         else
-          raise PacketArgumentError, "Invalid argument, not a Question object nor an array of objects"
+          raise ArgumentError, "Invalid argument, not a Question object nor an array of objects"
         end
       end
 
@@ -337,12 +349,12 @@ module Net # :nodoc:
           if object.all? {|x| x.kind_of? Net::DNS::RR}
             @answer = object
           else
-            raise PacketArgumentError, "Some of the elements is not an Net::DNS::RR object"
+            raise ArgumentError, "Some of the elements is not an Net::DNS::RR object"
           end
         when Net::DNS::RR
           @answer = [object]
         else
-          raise PacketArgumentError, "Invalid argument, not a RR object nor an array of objects"
+          raise ArgumentError, "Invalid argument, not a RR object nor an array of objects"
         end
       end
 
@@ -356,12 +368,12 @@ module Net # :nodoc:
           if object.all? {|x| x.kind_of? Net::DNS::RR}
             @additional = object
           else
-            raise PacketArgumentError, "Some of the elements is not an Net::DNS::RR object"
+            raise ArgumentError, "Some of the elements is not an Net::DNS::RR object"
           end
         when Net::DNS::RR
           @additional = [object]
         else
-          raise PacketArgumentError, "Invalid argument, not a RR object nor an array of objects"
+          raise ArgumentError, "Invalid argument, not a RR object nor an array of objects"
         end
       end
 
@@ -375,12 +387,12 @@ module Net # :nodoc:
           if object.all? {|x| x.kind_of? Net::DNS::RR}
             @authority = object
           else
-            raise PacketArgumentError, "Some of the elements is not an Net::DNS::RR object"
+            raise ArgumentError, "Some of the elements is not an Net::DNS::RR object"
           end
         when Net::DNS::RR
           @authority = [object]
         else
-          raise PacketArgumentError, "Invalid argument, not a RR object nor an array of objects"
+          raise ArgumentError, "Invalid argument, not a RR object nor an array of objects"
         end
       end
       
@@ -468,7 +480,7 @@ module Net # :nodoc:
         data.size
       end
 
-      # Chacks whether a query has returned a NXDOMAIN error,
+      # Checks whether a query has returned a NXDOMAIN error,
       # meaning the domain name queried doesn't exists.
       #
       #   %w[a.com google.com ibm.com d.com].each do |domain|
@@ -479,7 +491,7 @@ module Net # :nodoc:
       #     #=> d.com doesn't exist
       #
       def nxdomain?
-        header.rCode == Net::DNS::Header::NAME
+        header.rCode.code == Net::DNS::Header::RCode::NAME
       end
       
       private
@@ -566,16 +578,11 @@ module Net # :nodoc:
       def parse_question(data,offset)
         size = (dn_expand(data,offset)[1]-offset) + 2*Net::DNS::INT16SZ
         return [Net::DNS::Question.parse(data[offset,size]), offset+size]
-      rescue StandardError => err
-        raise PacketError, "Caught exception, maybe packet malformed => #{err}"
+      rescue StandardError => e
+        raise PacketError, "Caught exception, maybe packet malformed => #{e.message}"
       end
 
-    end # class Packet
+    end
     
-  end # module DNS
-end # module Net
-
-class PacketError < StandardError # :nodoc:
-end
-class PacketArgumentError < ArgumentError # :nodoc:
-end
+  end
+end

data/lib/net/dns/question.rb

@@ -1,12 +1,9 @@
-#---
-# $Id: Question.rb,v 1.8 2006/07/28 19:00:03 bluemonk Exp $     
-#+++
-
-require 'net/dns/dns'
+require 'net/dns'
 require 'net/dns/names/names'
 require 'net/dns/rr/types'
 require 'net/dns/rr/classes'
 
+
 module Net # :nodoc:
   module DNS 
 
@@ -49,8 +46,8 @@ module Net # :nodoc:
     # which are listed here to keep a light and browsable main documentation.
     # We have:
     #
-    # * QuestionArgumentError: generic argument error
-    # * QuestionNameError:     an error in the +name+ part of a Question entry
+    # ArgumentError::   Argument Error for class Net::DNS::Question
+    # NameError::       An error in the +name+ part of a Question entry
     #
     # =Copyright
     # 
@@ -60,9 +57,20 @@ module Net # :nodoc:
     # it and/or modify it under the same terms as Ruby itself.
     #
     class Question
-      
       include Net::DNS::Names
       
+      # Argument Error for class Net::DNS::Question
+      class ArgumentError < ArgumentError
+      end
+      
+      # Base error class.
+      class Error < StandardError
+      end
+      
+      # An error in the +name+ part of a Question entry
+      class NameError < Error
+      end
+      
       # +name+ part of a Question entry
       attr_reader :qName 
       # +type+ part of a Question entry
@@ -97,15 +105,11 @@ module Net # :nodoc:
       #     #=> Queried for example.com type A
       #
       def self.parse(arg)
-        if arg.kind_of? String
-          o = allocate
-          o.send(:new_from_binary,arg)
-          o
-        else
-          raise QuestionArgumentError, "Wrong argument format, must be a String"
-        end
+        o = allocate
+        o.send(:new_from_binary, arg.to_s)
+        o
       end
-
+      
       # Known inspect method with nice formatting
       def inspect
         if @qName.size > 29 then 
@@ -148,6 +152,40 @@ module Net # :nodoc:
         [[str,@qType.to_i,@qClass.to_i].pack("a*nn"),offset,names]
       end
       
+      
+      # 
+      # call-seq:
+      #   question.inspect -> string
+      #
+      # Returns a printable version of question with nice formatting.
+      #
+      #   q = Net::DNS::Question.new("google.com.", Net::DNS::A)
+      #   q.inspect # => "google.com.                  IN      A       "
+      #
+      def inspect
+        if @qName.size > 29 then
+          len = @qName.size + 1
+        else
+          len = 29
+        end
+        [@qName, @qClass.to_s, @qType.to_s].pack("A#{len} A8 A8")
+      end
+      
+      # 
+      # call-seq:
+      #   question.to_s -> string
+      #
+      # Returns a string representation of question.
+      # It is the same as <tt>inspect</tt>.
+      #
+      #   q = Net::DNS::Question.new("google.com.", Net::DNS::A)
+      #   q.inspect # => "google.com.                  IN      A       "
+      #
+      def to_s
+        "#{self.inspect}"
+      end
+      
+      
       private
       
       def build_qName(str)
@@ -167,12 +205,12 @@ module Net # :nodoc:
       def check_name(name)
         name.strip!
         if name =~ /[^\w\.\-_]/
-          raise QuestionNameError, "Question name #{name.inspect} not valid"          
+          raise NameError, "Question name #{name.inspect} not valid"          
         else
           name
         end
       rescue
-        raise QuestionNameError, "Question name #{name.inspect} not valid"                  
+        raise NameError, "Question name #{name.inspect} not valid"                  
       end
       
       def new_from_binary(data)
@@ -181,15 +219,10 @@ module Net # :nodoc:
         @qType = Net::DNS::RR::Types.new type
         @qClass = Net::DNS::RR::Classes.new cls
       rescue StandardError => e
-        raise QuestionArgumentError, "Invalid data: #{data.inspect}\n{e.backtrace}"
+        raise ArgumentError, "Invalid data: #{data.inspect}\n{e.backtrace}"
       end
 
-    end # class Question
+    end
     
-  end # class DNS
-end # module Net
-
-class QuestionArgumentError < ArgumentError # :nodoc:
-end
-class QuestionNameError < StandardError # :nodoc:
-end
+  end
+end

data/lib/net/dns/resolver.rb

@@ -1,9 +1,3 @@
-#
-#       $Id: Resolver.rb,v 1.11 2006/07/30 16:55:35 bluemonk Exp $      
-#
-
-
-
 require 'rbconfig'
 require 'socket'
 require 'timeout'
@@ -15,18 +9,18 @@ require 'net/dns/resolver/timeouts'
 alias old_send send
 
 #
-# Resolver helper method
+# = Resolver helper method
 # 
-# Calling the resolver directly
+# Calling the resolver directly:
 # 
 #   require 'net/dns/resolver'
 #   puts Resolver("www.google.com").answer.size
-#     #=> 5
+#   #=> 5
 #
-# An optional block can be passed yielding the Net::DNS::Packet object
+# An optional block can be passed yielding the Net::DNS::Packet object.
 #
 #   Resolver("www.google.com") {|packet| puts packet.size + " bytes"}
-#     #=> 484 bytes
+#   #=> 484 bytes
 #
 def Resolver(name,type=Net::DNS::A,cls=Net::DNS::IN,&blk)
   obj = Net::DNS::Resolver.start(name,type,cls)
@@ -42,16 +36,8 @@ module Net # :nodoc:
     
     include Logger::Severity
 
-    # =Name
-    # 
-    # Net::DNS::Resolver - DNS resolver class
-    #
-    # =Synopsis
+    # = Net::DNS::Resolver - DNS resolver class
     #
-    #    require 'net/dns/resolver'
-    #
-    # =Description
-    # 
     # The Net::DNS::Resolver class implements a complete DNS resolver written
     # in pure Ruby, without a single C line of code. It has all of the 
     # tipical properties of an evoluted resolver, and a bit of OO which 
@@ -63,9 +49,7 @@ module Net # :nodoc:
     # the Perl version are still missing, but guys, at least this is
     # readable code! 
     #
-    # FIXME
-    #
-    # =Environment
+    # == Environment
     #
     # The Following Environment variables can also be used to configure 
     # the resolver:
@@ -109,7 +93,18 @@ module Net # :nodoc:
     #      % setenv RES_OPTIONS "retrans:3 retry:2 debug"
     #        
     class Resolver
-
+      
+      # Argument Error for class Net::DNS::Resolver.
+      class ArgumentError < ArgumentError
+      end
+      
+      class Error < StandardError
+      end
+      
+      class NoResponseError < Error
+      end
+      
+      
       # An hash with the defaults values of almost all the
       # configuration parameters of a resolver object. See
       # the description for each parameter to have an 
@@ -131,8 +126,9 @@ module Net # :nodoc:
         :use_tcp => false,
         :ignore_truncated => false,
         :packet_size => 512,
-        :tcp_timeout => TcpTimeout.new(120),
-        :udp_timeout => UdpTimeout.new(0)}
+        :tcp_timeout => TcpTimeout.new(5),
+        :udp_timeout => UdpTimeout.new(5),
+      }
       
       # Create a new resolver object.
       # 
@@ -152,7 +148,7 @@ module Net # :nodoc:
       #                                :recursive => false,
       #                                :retry => 10)
       #
-      # ===Config file
+      # == Config file
       # 
       # Net::DNS::Resolver uses a config file to read the usual
       # values a resolver needs, such as nameserver list and
@@ -191,42 +187,42 @@ module Net # :nodoc:
       # Explicit arguments to Resolver::new override both the system's defaults 
       # and the values of the custom configuration file, if any.
       #
-      # ===Parameters
+      # == Parameters
       # 
       # The following arguments to Resolver::new are supported:
       # 
-      # - nameservers: an array reference of nameservers to query.
-      # - searchlist:  an array reference of domains.
-      # - recurse
-      # - debug
-      # - domain
-      # - port
-      # - srcaddr
-      # - srcport
-      # - tcp_timeout
-      # - udp_timeout
-      # - retrans
-      # - retry
-      # - usevc
-      # - stayopen
-      # - igntc
-      # - defnames
-      # - dnsrch
-      # - persistent_tcp
-      # - persistent_udp
-      # - dnssec
+      # * nameservers: an array reference of nameservers to query.
+      # * searchlist:  an array reference of domains.
+      # * recurse
+      # * debug
+      # * domain
+      # * port
+      # * srcaddr
+      # * srcport
+      # * tcp_timeout
+      # * udp_timeout
+      # * retrans
+      # * retry
+      # * usevc
+      # * stayopen
+      # * igntc
+      # * defnames
+      # * dnsrch
+      # * persistent_tcp
+      # * persistent_udp
+      # * dnssec
       #
       # For more information on any of these options, please consult the 
       # method of the same name.
       #
-      # ===Disclaimer
+      # == Disclaimer
       # 
       # Part of the above documentation is taken from the one in the 
       # Net::DNS::Resolver Perl module.
       #
       def initialize(config = {})
-        raise ResolverArgumentError, "Argument has to be Hash" unless config.kind_of? Hash
-        # config.key_downcase!
+        raise ArgumentError, "Argument has to be Hash" unless config.kind_of? Hash
+        # config.downcase_keys!
         @config = Defaults.merge config
         @raw = false
 
@@ -262,33 +258,33 @@ module Net # :nodoc:
           begin
             eval "self.#{key.to_s} = val"
           rescue NoMethodError
-            raise ResolverArgumentError, "Option #{key} not valid"
+            raise ArgumentError, "Option #{key} not valid"
           end
         end
       end
         
-      # Get the resolver searchlist, returned as an array of entries
+      # Get the resolver search list, returned as an array of entries.
       #
       #   res.searchlist
-      #     #=> ["example.com","a.example.com","b.example.com"]
+      #   #=> ["example.com","a.example.com","b.example.com"]
       #
       def searchlist
         @config[:searchlist].inspect
       end
 
       # Set the resolver searchlist. 
-      # +arg+ can be a single string or an array of strings
+      # +arg+ can be a single string or an array of strings.
       #
       #   res.searchstring = "example.com"
       #   res.searchstring = ["example.com","a.example.com","b.example.com"]
       #
-      # Note that you can also append a new name to the searchlist
+      # Note that you can also append a new name to the searchlist.
       #
       #   res.searchlist << "c.example.com"
       #   res.searchlist
-      #     #=> ["example.com","a.example.com","b.example.com","c.example.com"]
+      #   #=> ["example.com","a.example.com","b.example.com","c.example.com"]
       #
-      # The default is an empty array
+      # The default is an empty array.
       #
       def searchlist=(arg)
         case arg
@@ -299,11 +295,11 @@ module Net # :nodoc:
           @config[:searchlist] = arg if arg.all? {|x| valid? x}
           @logger.info "Searchlist changed to value #{@config[:searchlist].inspect}"          
         else
-          raise ResolverArgumentError, "Wrong argument format, neither String nor Array"
+          raise ArgumentError, "Wrong argument format, neither String nor Array"
         end
       end
       
-      # Get the list of resolver nameservers, in a dotted decimal format
+      # Get the list of resolver nameservers, in a dotted decimal format-
       #
       #   res.nameservers
       #     #=> ["192.168.0.1","192.168.0.2"]
@@ -317,17 +313,17 @@ module Net # :nodoc:
       end
       alias_method :nameserver, :nameservers
 
-      # Set the list of resolver nameservers
-      # +arg+ can be a single ip address or an array of addresses
+      # Set the list of resolver nameservers.
+      # +arg+ can be a single ip address or an array of addresses.
       #
       #   res.nameservers = "192.168.0.1"
       #   res.nameservers = ["192.168.0.1","192.168.0.2"]
       #
-      # If you want you can specify the addresses as IPAddr instances
+      # If you want you can specify the addresses as IPAddr instances.
       #
       #   ip = IPAddr.new("192.168.0.3")
       #   res.nameservers << ip
-      #     #=> ["192.168.0.1","192.168.0.2","192.168.0.3"]
+      #   #=> ["192.168.0.1","192.168.0.2","192.168.0.3"]
       #
       # The default is 127.0.0.1 (localhost)
       #
@@ -357,30 +353,27 @@ module Net # :nodoc:
                                      when IPAddr
                                        x
                                      else
-                                       raise ResolverArgumentError, "Wrong argument format"
+                                       raise ArgumentError, "Wrong argument format"
                                      end
           end
           @logger.info "Nameservers list changed to value #{@config[:nameservers].inspect}"          
         else
-          raise ResolverArgumentError, "Wrong argument format, neither String, Array nor IPAddr"
+          raise ArgumentError, "Wrong argument format, neither String, Array nor IPAddr"
         end
       end
       alias_method("nameserver=","nameservers=")
       
-      # Return a string with the default domain 
-      #
+      # Return a string with the default domain.
       def domain
         @config[:domain].inspect
       end
 
-      # Set the domain for the query
-      #
+      # Set the domain for the query.
       def domain=(name)
         @config[:domain] = name if valid? name
       end
       
-      # Return the defined size of the packet
-      #
+      # Return the defined size of the packet.
       def packet_size
         @config[:packet_size]
       end
@@ -405,11 +398,11 @@ module Net # :nodoc:
           @config[:port] = num
           @logger.info "Port number changed to #{num}"          
         else
-          raise ResolverArgumentError, "Wrong port number #{num}"
+          raise ArgumentError, "Wrong port number #{num}"
         end
       end
 
-      # Get the value of the source port number
+      # Get the value of the source port number.
       #
       #   puts "Sending queries using port #{res.source_port}"
       #
@@ -436,7 +429,7 @@ module Net # :nodoc:
         if (0..65535).include?(num) 
           @config[:source_port] = num
         else
-          raise ResolverArgumentError, "Wrong port number #{num}"
+          raise ArgumentError, "Wrong port number #{num}"
         end
       end
       alias srcport= source_port= 
@@ -450,8 +443,7 @@ module Net # :nodoc:
       end
       alias srcaddr source_address 
 
-      # Set the local source address from which the resolver sends its 
-      # queries.
+      # Set the local source address from which the resolver sends its queries.
       #
       #   res.source_address = "172.16.100.1"
       #   res.source_address = IPAddr.new("172.16.100.1")
@@ -472,12 +464,11 @@ module Net # :nodoc:
       # root priviledges, as raw sockets will be used to generate packets. 
       # The class will then generate an exception if you're not root.
       #
-      # The default is 0.0.0.0, meaning any local address (chosen on routing
-      # needs).
+      # The default is 0.0.0.0, meaning any local address (chosen on routing needs).
       #
       def source_address=(addr)
         unless addr.respond_to? :to_s
-          raise ResolverArgumentError, "Wrong address argument #{addr}"
+          raise ArgumentError, "Wrong address argument #{addr}"
         end
 
         begin
@@ -513,26 +504,24 @@ module Net # :nodoc:
       alias srcaddr= source_address= 
       
       # Return the retrasmission interval (in seconds) the resolvers has 
-      # been set on
-      #
+      # been set on.
       def retry_interval
         @config[:retry_interval]
       end
       alias retrans retry_interval 
 
-      # Set the retrasmission interval in seconds. Default 5 seconds
-      #
+      # Set the retrasmission interval in seconds. Default 5 seconds.
       def retry_interval=(num)
         if num > 0
           @config[:retry_interval] = num
           @logger.info "Retransmission interval changed to #{num} seconds"          
         else
-          raise ResolverArgumentError, "Interval must be positive"
+          raise ArgumentError, "Interval must be positive"
         end
       end
       alias retrans= retry_interval= 
 
-      # The number of times the resolver will try a query
+      # The number of times the resolver will try a query.
       #
       #   puts "Will try a max of #{res.retry_number} queries"
       #
@@ -541,14 +530,13 @@ module Net # :nodoc:
       end
 
       # Set the number of times the resolver will try a query.
-      # Default 4 times
-      #
+      # Default 4 times.
       def retry_number=(num)
         if num.kind_of? Integer and num > 0
           @config[:retry_number] = num
           @logger.info "Retrasmissions number changed to #{num}"
         else
-          raise ResolverArgumentError, "Retry value must be a positive integer"
+          raise ArgumentError, "Retry value must be a positive integer"
         end
       end        
       alias_method('retry=', 'retry_number=') 
@@ -577,12 +565,12 @@ module Net # :nodoc:
           @config[:recursive] = bool
           @logger.info("Recursive state changed to #{bool}")
         else
-          raise ResolverArgumentError, "Argument must be boolean"
+          raise ArgumentError, "Argument must be boolean"
         end
       end
       alias_method :recurse=, :recursive= 
       
-      # Return a string rapresenting the resolver state, suitable
+      # Return a string representing the resolver state, suitable
       # for printing on the screen.
       #
       #   puts "Resolver state:"
@@ -629,11 +617,11 @@ module Net # :nodoc:
           @config[:defname] = bool
           @logger.info("Defname state changed to #{bool}")          
         else
-          raise ResolverArgumentError, "Argument must be boolean"
+          raise ArgumentError, "Argument must be boolean"
         end
       end
 
-      # Get the state of the dns_search flag
+      # Get the state of the dns_search flag.
       def dns_search
         @config[:dns_search]
       end
@@ -642,14 +630,13 @@ module Net # :nodoc:
       # Set the flag +dns_search+ in a boolean state. If +dns_search+
       # is true, when using the Resolver#search method will be applied
       # the search list. Default is true.
-      #
       def dns_search=(bool)
         case bool
         when TrueClass,FalseClass
           @config[:dns_search] = bool
           @logger.info("DNS search state changed to #{bool}")          
         else
-          raise ResolverArgumentError, "Argument must be boolean"
+          raise ArgumentError, "Argument must be boolean"
         end
       end
       alias_method("dnsrch=","dns_search=")
@@ -678,7 +665,7 @@ module Net # :nodoc:
           @config[:use_tcp] = bool
           @logger.info("Use tcp flag changed to #{bool}")          
         else
-          raise ResolverArgumentError, "Argument must be boolean"
+          raise ArgumentError, "Argument must be boolean"
         end
       end
       alias usevc= use_tcp= 
@@ -694,7 +681,7 @@ module Net # :nodoc:
           @config[:ignore_truncated] = bool
           @logger.info("Ignore truncated flag changed to #{bool}")          
         else
-          raise ResolverArgumentError, "Argument must be boolean"
+          raise ArgumentError, "Argument must be boolean"
         end
       end
       
@@ -712,8 +699,7 @@ module Net # :nodoc:
       #   puts "You set a timeout of " + res.tcp_timeout.pretty_to_s
       #     #=> You set a timeout of 2 minutes and 30 seconds
       #
-      # If the timeout is infinite, a string "infinite" will
-      # be returned.
+      # If the timeout is infinite, a string "infinite" will be returned.
       #
       def tcp_timeout
         @config[:tcp_timeout].to_s
@@ -725,7 +711,8 @@ module Net # :nodoc:
       # The value is stored internally as a +TcpTimeout+ object, see
       # the description for Resolver#tcp_timeout
       #
-      # Default is 120 seconds
+      # Default is 5 seconds.
+      #
       def tcp_timeout=(secs)
         @config[:tcp_timeout] = TcpTimeout.new(secs)
         @logger.info("New TCP timeout value: #{@config[:tcp_timeout]} seconds")        
@@ -734,7 +721,7 @@ module Net # :nodoc:
       # Return an object representing the value of the stored UDP 
       # timeout the resolver will use in is queries. This object
       # is an instance of the class +UdpTimeout+, and two methods
-      # are available for printing informations: UdpTimeout#to_s
+      # are available for printing information: UdpTimeout#to_s
       # and UdpTimeout#pretty_to_s.
       #
       # Here's some example:
@@ -756,10 +743,11 @@ module Net # :nodoc:
       # will be performed using UDP. A value of 0 means that
       # the timeout will not be used, and the resolver will use 
       # only +retry_number+ and +retry_interval+ parameters.
-      # That is the default.
+      # 
+      # Default is 5 seconds.
       #
       # The value is stored internally as a +UdpTimeout+ object, see
-      # the description for Resolver#udp_timeout
+      # the description for Resolver#udp_timeout.
       #
       def udp_timeout=(secs)
         @config[:udp_timeout] = UdpTimeout.new(secs)
@@ -803,7 +791,7 @@ module Net # :nodoc:
           @logger.close
           @logger = logger
         else
-          raise ResolverArgumentError, "Argument must be an instance of Logger class"
+          raise ArgumentError, "Argument must be an instance of Logger class"
         end
       end
 
@@ -995,8 +983,9 @@ module Net # :nodoc:
         ans = self.old_send(method,packet,packet_data)
         
         unless ans
-          @logger.fatal "No response from nameservers list: aborting"
-          raise NoResponseError
+          message = "No response from nameservers list"
+          @logger.fatal(message)
+          raise NoResponseError, message
         end
 
         @logger.info "Received #{ans[0].size} bytes from #{ans[1][2]+":"+ans[1][1].to_s}"
@@ -1033,8 +1022,6 @@ module Net # :nodoc:
       # use, but automatically sort the results based on preferences 
       # and returns an ordered array.
       #
-      # Example:
-      #
       #   res = Net::DNS::Resolver.new
       #   res.mx("google.com")
       #
@@ -1046,13 +1033,10 @@ module Net # :nodoc:
         return arr.sort_by {|a| a.preference}
       end
 
-      #
       # Quick resolver method. Bypass the configuration using
       # the defaults.
       #
-      # Example:
-      #
-      #   puts Net::DNS::Resolver.start "www.google.com"
+      #   Net::DNS::Resolver.start "www.google.com"
       #
       def self.start(*params)
         self.new.search(*params)
@@ -1060,8 +1044,7 @@ module Net # :nodoc:
 
       private
       
-      # Parse a configuration file specified as the argument. 
-      #
+      # Parses a configuration file specified as the argument.
       def parse_config_file
         if self.class.platform_windows?
           require 'win32/resolv'
@@ -1084,7 +1067,7 @@ module Net # :nodoc:
         end
       end
       
-      # Parse environment variables
+      # Parses environment variables.
       def parse_environment_variables
         if ENV['RES_NAMESERVERS']
           self.nameservers = ENV['RES_NAMESERVERS'].split(" ")
@@ -1101,7 +1084,7 @@ module Net # :nodoc:
             begin
               eval("self.#{name} = #{val}")
             rescue NoMethodError
-              raise ResolverArgumentError, "Invalid ENV option #{name}"
+              raise ArgumentError, "Invalid ENV option #{name}"
             end
           end
         end
@@ -1219,7 +1202,7 @@ module Net # :nodoc:
 
       def valid?(name)
         if name =~ /[^-\w\.]/
-          raise ResolverArgumentError, "Invalid domain name #{name}"
+          raise ArgumentError, "Invalid domain name #{name}"
         else
           true
         end
@@ -1239,44 +1222,6 @@ module Net # :nodoc:
         
       end
     
-    end # class Resolver
-  end # module DNS
-end # module Net
-
-class ResolverArgumentError < ArgumentError # :nodoc:
-end
-class NoResponseError < StandardError # :nodoc:
-end
-
-module ExtendHash # :nodoc: 
-  # Returns an hash with all the 
-  # keys turned into downcase
-  #
-  #   hsh = {"Test" => 1, "FooBar" => 2}
-  #   hsh.key_downcase!
-  #      #=> {"test"=>1,"foobar"=>2}
-  #
-  def key_downcase!
-    hsh = Hash.new
-    self.each do |key,val|
-      hsh[key.downcase] = val
     end
-    self.replace(hsh)
   end
-end
-
-class Hash # :nodoc:
-  include ExtendHash
-end
-
-      
-       
-      
-      
-      
-      
-      
-        
-      
-        
-    
+end