dnsruby 1.46 → 1.47

data/lib/Dnsruby/PacketSender.rb

@@ -65,6 +65,11 @@ module Dnsruby
     # 
     # Defaults to false
     attr_accessor :use_tcp
+
+    # Use UDP only - don't use TCP
+    # For test/debug purposes only
+    # Defaults to false
+    attr_accessor :no_tcp
     
     # The TSIG record to sign/verify messages with
     attr_reader :tsig
@@ -152,6 +157,7 @@ module Dnsruby
     # * :server
     # * :port
     # * :use_tcp
+    # * :no_tcp
     # * :ignore_truncation
     # * :src_address
     # * :src_port
@@ -166,6 +172,7 @@ module Dnsruby
       @udp_size = Resolver::DefaultUDPSize
       @dnssec = Resolver::DefaultDnssec
       @use_tcp = false
+      @no_tcp = false
       @tsig = nil
       @ignore_truncation = false
       @src_address        = '0.0.0.0'
@@ -312,6 +319,13 @@ module Dnsruby
       end
       # Otherwise, run the query
       if (udp_packet_size < query_packet.length)
+        if (@no_tcp)
+          # Can't send the message - abort!
+              err=IOError.new("Can't send message - too big for UDP and no_tcp=true")
+              Dnsruby.log.error{"#{err}"}
+              st.push_exception_to_select(client_query_id, client_queue, err, nil)
+              return
+        end
         Dnsruby.log.debug{"Query packet length exceeds max UDP packet size - using TCP"}
         use_tcp = true
       end
@@ -392,10 +406,10 @@ module Dnsruby
         end
         socket.send(query_bytes, 0)
       rescue Exception => e
-        st.push_exception_to_select(client_query_id, client_queue, err, nil)
-        socket.close
         err=IOError.new("Send failed to #{@server}:#{@port} from #{@src_address}:#{src_port}, use_tcp=#{use_tcp}, exception : #{e}")
         Dnsruby.log.error{"#{err}"}
+        st.push_exception_to_select(client_query_id, client_queue, err, nil)
+        socket.close
         return
       end
       
@@ -499,12 +513,16 @@ module Dnsruby
         end
       end
       if (response.header.tc && !tcp && !@ignore_truncation)
-        # Try to resend over tcp
-        Dnsruby.log.debug{"Truncated - resending over TCP"}
-        # @TODO@ Are the query options used correctly here? DNSSEC in particular...
-        #        query.send_raw = true # Make sure that the packet is not messed with.
-        send_async(query, client_queue, client_query_id, true)
-        return false
+        if (@no_tcp)
+          Dnsruby.log.debug{"Truncated response - not resending over TCP as no_tcp==true"}
+        else
+          # Try to resend over tcp
+          Dnsruby.log.debug{"Truncated - resending over TCP"}
+          # @TODO@ Are the query options used correctly here? DNSSEC in particular...
+          #        query.send_raw = true # Make sure that the packet is not messed with.
+          send_async(query, client_queue, client_query_id, true)
+          return false
+        end
       end
       return true
     end
@@ -549,12 +567,12 @@ module Dnsruby
           packet.header.rd=@recurse
         end
 
-        # @TODO@ Only do this if the packet has not been prepared already!
+        # Only do this if the packet has not been prepared already!
         if (@dnssec)
           prepare_for_dnssec(packet)
-        
         elsif ((udp_packet_size > Resolver::DefaultUDPSize) && !use_tcp)
           #      if ((udp_packet_size > Resolver::DefaultUDPSize) && !use_tcp)
+          # @TODO@ What if an existing OPT RR is not big enough? Should we replace it?
           add_opt_rr(packet)
         end
       end
@@ -570,7 +588,10 @@ module Dnsruby
       # RFC 3225
       optrr = RR::OPT.new(udp_packet_size)
 
-      packet.add_additional(optrr)
+      # Only one OPT RR allowed per packet - do we already have one?
+      if (packet.additional.rrset(packet.question()[0].qname, Types::OPT).rrs.length == 0)
+        packet.add_additional(optrr)
+      end
     end
 
     def prepare_for_dnssec(packet)

data/lib/Dnsruby/Resolver.rb

@@ -78,7 +78,12 @@ module Dnsruby
     attr_reader :port
     
     # Should TCP be used as a transport rather than UDP?
+    # If use_tcp==true, then ONLY TCP will be used as a transport.
     attr_reader :use_tcp
+
+    # If no_tcp==true, then ONLY UDP will be used as a transport.
+    # This should not generally be used, but is provided as a debugging aid.
+    attr_reader :no_tcp
     
     
     attr_reader :tsig
@@ -288,7 +293,7 @@ module Dnsruby
     #* msg - the message to send
     #* client_queue - a Queue to push the response to, when it arrives
     #* client_query_id - an optional ID to identify the query to the client
-    #* use_tcp - whether to use TCP (defaults to SingleResolver.use_tcp)
+    #* use_tcp - whether to use only TCP (defaults to SingleResolver.use_tcp)
     #
     #Returns :
     # 
@@ -417,12 +422,13 @@ module Dnsruby
       @single_res_mutex.synchronize {
         # Add the Config nameservers
         @config.nameserver.each do |ns|
-          @single_resolvers.push(PacketSender.new({:server=>ns, :dnssec=>@dnssec,
-                :use_tcp=>@use_tcp, :packet_timeout=>@packet_timeout,
+          res = PacketSender.new({:server=>ns, :dnssec=>@dnssec,
+                :use_tcp=>@use_tcp, :no_tcp=>@no_tcp, :packet_timeout=>@packet_timeout,
                 :tsig => @tsig, :ignore_truncation=>@ignore_truncation,
                 :src_address=>@src_address, :src_port=>@src_port,
                 :do_caching=>@do_caching,
-                :recurse=>@recurse, :udp_size=>@udp_size}))
+                :recurse=>@recurse, :udp_size=>@udp_size})
+          @single_resolvers.push(res) if res
         end
       }
     end
@@ -457,6 +463,7 @@ module Dnsruby
       @dnssec = DefaultDnssec
       @do_caching= true
       @use_tcp = false
+      @no_tcp = false
       @tsig = nil
       @ignore_truncation = false
       @config = Config.new()
@@ -472,6 +479,7 @@ module Dnsruby
     def update #:nodoc: all
       #Update any resolvers we have with the latest config
       @single_res_mutex.synchronize {
+        @single_resolvers.delete(nil) # Just in case...
         @single_resolvers.each do |res|
           update_internal_res(res)
         end
@@ -488,6 +496,7 @@ module Dnsruby
     def add_server(server)# :nodoc:
       @configured = true
       res = PacketSender.new(server)
+      raise ArgumentError.new("Can't create server #{server}") if !res
       update_internal_res(res)
       @single_res_mutex.synchronize {
         @single_resolvers.push(res)
@@ -495,7 +504,7 @@ module Dnsruby
     end
 
     def update_internal_res(res)
-      [:port, :use_tcp, :tsig, :ignore_truncation, :packet_timeout,
+      [:port, :use_tcp, :no_tcp, :tsig, :ignore_truncation, :packet_timeout,
         :src_address, :src_port, :recurse,
         :udp_size, :dnssec].each do |param|
 
@@ -625,6 +634,11 @@ module Dnsruby
       @use_tcp = on
       update
     end
+
+    def no_tcp=(on)
+      @no_tcp=on
+      update
+    end
     
     #Sets the TSIG to sign outgoing messages with.
     #Pass in either a Dnsruby::RR::TSIG, or a key_name and key (or just a key)
@@ -732,11 +746,10 @@ module Dnsruby
         if (retry_count>0)
           retry_delay *= 2
         end
-        #          servers=[]
-        #          @single_resolvers.each do |r| servers.push(r.server) end
+
+        @single_resolvers.delete(nil) # Just in case...
         @single_resolvers.each_index do |i|
           res= @single_resolvers[i]
-          next if !res # @TODO@ WHY?1
           offset = (i*@retry_delay.to_f/@single_resolvers.length)
           if (retry_count==0)
             timeouts[base+offset]=[res, retry_count]

data/lib/Dnsruby/SingleResolver.rb

@@ -43,6 +43,7 @@ module Dnsruby
     # * :server
     # * :port
     # * :use_tcp
+    # * :no_tcp
     # * :ignore_truncation
     # * :src_address
     # * :src_port
@@ -61,6 +62,7 @@ module Dnsruby
       @udp_size = Resolver::DefaultUDPSize
       @dnssec = Resolver::DefaultDnssec
       @use_tcp = false
+      @no_tcp = false
       @tsig = nil
       @ignore_truncation = false
       @src_address        = nil
@@ -111,7 +113,7 @@ module Dnsruby
       end
 
       isr = PacketSender.new({:server=>@server, :dnssec=>@dnssec,
-          :use_tcp=>@use_tcp, :packet_timeout=>@packet_timeout,
+          :use_tcp=>@use_tcp, :no_tcp=>@no_tcp, :packet_timeout=>@packet_timeout,
           :tsig => @tsig, :ignore_truncation=>@ignore_truncation,
           :src_address=>@src_address, :src_port=>@src_port,
           :do_caching=>@do_caching,
@@ -128,7 +130,7 @@ module Dnsruby
       end
       @server = Config.resolve_server(s).to_s
       isr = PacketSender.new({:server=>@server, :dnssec=>@dnssec,
-          :use_tcp=>@use_tcp, :packet_timeout=>@packet_timeout,
+          :use_tcp=>@use_tcp, :no_tcp=>@no_tcp, :packet_timeout=>@packet_timeout,
           :tsig => @tsig, :ignore_truncation=>@ignore_truncation,
           :src_address=>@src_address, :src_port=>@src_port,
           :do_caching=>@do_caching,

data/lib/Dnsruby/message.rb

@@ -99,7 +99,10 @@ module Dnsruby
           if (rr.type == Types::RRSIG)
             type_ok = (rr.type_covered == type)
           end
-          type_ok && (rr.klass == klass) && (rr.name.to_s.downcase == name.to_s.downcase)
+          if (!(/\.\z/ =~ name.to_s))
+            name = name.to_s + "."
+          end
+          type_ok && (rr.klass == klass) && (rr.name.to_s(true).downcase == name.to_s().downcase)
         }
         rrset = RRSet.new()
         rrs.each do |rr|
@@ -668,10 +671,7 @@ module Dnsruby
     attr_accessor :cd
     
     #The Authenticated Data flag
-    attr_accessor :ad
-    
     #Relevant in DNSSEC context.
-    #
     #(The AD bit is only set on answers where signatures have been
     #cryptographically verified or the server is authoritative for the data
     #and is allowed to set the bit by policy.)

data/lib/Dnsruby/name.rb

@@ -221,8 +221,12 @@ module Dnsruby
     #   p Resolv::Name.create("x.y.z.").to_s #=> "x.y.z"
     #   p Resolv::Name.create("x.y.z").to_s #=> "x.y.z"
     #
-    def to_s
-      return to_str(@labels)
+    def to_s(include_absolute=false)
+      ret = to_str(@labels)
+      if (@absolute && include_absolute)
+        ret += "."
+      end
+      return ret
     end
 
     def to_str(labels) # :nodoc: all

data/lib/Dnsruby/resource/AFSDB.rb

@@ -46,7 +46,7 @@ module Dnsruby
         
         def rdata_to_string #:nodoc: all
           if defined?@subtype
-            return "#{@subtype} #{@hostname}." 
+            return "#{@subtype} #{@hostname.to_s(true)}"
           else
             return '';
           end

data/lib/Dnsruby/resource/HIP.rb

@@ -105,7 +105,7 @@ module Dnsruby
       def rdata_to_string #:nodoc: all
         ret = "#{@pk_algorithm} #{hit_string} #{public_key_string}"
         @rsvs.each {|rsv|
-          ret += " #{rsv}"
+          ret += " #{rsv.to_s(true)}"
         }
         return ret
       end

data/lib/Dnsruby/resource/KX.rb

@@ -45,7 +45,7 @@ module Dnsruby
       
       def rdata_to_string #:nodoc: all
         if (@preference!=nil)
-          return "#{@preference} #{@exchange}"
+          return "#{@preference} #{@exchange.to_s(true)}"
         else
           return ""
         end

data/lib/Dnsruby/resource/MINFO.rb

@@ -49,7 +49,7 @@ module Dnsruby
       
       def rdata_to_string #:nodoc: all
         if (@rmailbx!=nil)
-          return "#{@rmailbx} #{@emailbx}"
+          return "#{@rmailbx.to_s(true)} #{@emailbx.to_s(true)}"
         else
           return ""
         end

data/lib/Dnsruby/resource/MX.rb

@@ -45,7 +45,7 @@ module Dnsruby
       
       def rdata_to_string #:nodoc: all
         if (@preference!=nil)
-          return "#{@preference} #{@exchange}"
+          return "#{@preference} #{@exchange.to_s(true)}"
         else
           return ""
         end

data/lib/Dnsruby/resource/NAPTR.rb

@@ -67,7 +67,7 @@ module Dnsruby
         if (@order!=nil)
           ret =  "#{@order} #{@preference} \"#{@flags}\" \"#{@service}\" \""
           ret += TXT.display(@regexp)
-          ret += "\" #{@replacement}"
+          ret += "\" #{@replacement.to_s(true)}"
 
           return ret
         else

data/lib/Dnsruby/resource/NSEC.rb

@@ -274,7 +274,7 @@ module Dnsruby
             type_strings.push(t.string)
           end
           types = type_strings.join(" ")
-          return "#{@next_domain} ( #{types} )"
+          return "#{@next_domain.to_s(true)} ( #{types} )"
         else
           return ""
         end

data/lib/Dnsruby/resource/PX.rb

@@ -47,7 +47,7 @@ module Dnsruby
         
         def rdata_to_string #:nodoc: all
           if (@preference!=nil)
-            return "#{@preference} #{@map822} #{@mapx400}"
+            return "#{@preference} #{@map822.to_s(true)} #{@mapx400.to_s(true)}"
           else
             return ""
           end

data/lib/Dnsruby/resource/RP.rb

@@ -46,7 +46,7 @@ module Dnsruby
       
       def rdata_to_string #:nodoc: all
         if (@mailbox!=nil)
-          return "#{@mailbox} #{@txtdomain}"
+          return "#{@mailbox.to_s(true)} #{@txtdomain.to_s(true)}"
         else
           return ""
         end

data/lib/Dnsruby/resource/RRSIG.rb

@@ -232,7 +232,7 @@ module Dnsruby
           # @TODO@ Display the expiration and inception as 
           return "#{@type_covered.string} #{@algorithm.string} #{@labels} #{@original_ttl} " + 
             "#{format_time(@expiration)} ( #{format_time(@inception)} " + 
-            "#{@key_tag} #{@signers_name} #{signature} )"
+            "#{@key_tag} #{@signers_name.to_s(true)} #{signature} )"
         else
           return ""
         end

data/lib/Dnsruby/resource/RT.rb

@@ -46,7 +46,7 @@ module Dnsruby
       
       def rdata_to_string #:nodoc: all
         if (@preference!=nil)
-          return "#{@preference} #{@intermediate}"
+          return "#{@preference} #{@intermediate.to_s(true)}"
         else
           return ""
         end

data/lib/Dnsruby/resource/SOA.rb

@@ -71,7 +71,7 @@ module Dnsruby
       
       def rdata_to_string #:nodoc: all
         if (@mname!=nil)
-          return "#{@mname} #{@rname} #{@serial} #{@refresh} #{@retry} #{@expire} #{@minimum}"
+          return "#{@mname.to_s(true)} #{@rname.to_s(true)} #{@serial} #{@refresh} #{@retry} #{@expire} #{@minimum}"
         else
           return ""
         end

data/lib/Dnsruby/resource/SRV.rb

@@ -86,7 +86,7 @@ module Dnsruby
         
         def rdata_to_string
           if (@target!=nil)
-            return "#{@priority} #{@weight} #{@port} #{@target}"
+            return "#{@priority} #{@weight} #{@port} #{@target.to_s(true)}"
           else
             return ""
           end

data/lib/Dnsruby/resource/TKEY.rb

@@ -131,7 +131,7 @@ module Dnsruby
         if (@algorithm!=nil)
           error = @error
           error = "UNDEFINED" unless error!=nil
-          rdatastr = "#{@algorithm}. #{error}"
+          rdatastr = "#{@algorithm.to_s(true)} #{error}"
           if (@other_size != nil && @other_size >0 && @other_data!=nil)
             rdatastr += " #{@other_data}"
           end

data/lib/Dnsruby/resource/TSIG.rb

@@ -550,7 +550,7 @@ module Dnsruby
         if (@algorithm!=nil)
           error = @error
           error = "UNDEFINED" unless error!=nil
-          rdatastr = "#{@original_id} #{@time_signed} #{@algorithm}. #{error}";
+          rdatastr = "#{@original_id} #{@time_signed} #{@algorithm.to_s(true)} #{error}";
           if (@other_size > 0 && @other_data!=nil)
             rdatastr += " #{@other_data}"
           end

data/lib/Dnsruby/resource/domain_name.rb

@@ -39,7 +39,7 @@ module Dnsruby
       end
       
       def rdata_to_string #:nodoc: all
-        return @domainname.to_s
+        return @domainname.to_s(true)
       end
       
       def encode_rdata(msg, canonical=false) #:nodoc: all

data/lib/Dnsruby/resource/resource.rb

@@ -503,7 +503,7 @@ module Dnsruby
     
     #Returns a string representation of the RR in zone file format
     def to_s
-      return (@name ? @name.to_s():"") + ".\t" +(@ttl ? @ttl.to_s():"") + "\t" + (klass() ? klass.to_s():"") + "\t" + (type() ? type.to_s():"") + "\t" + rdata_to_string
+      return (@name ? @name.to_s(true):"") + "\t" +(@ttl ? @ttl.to_s():"") + "\t" + (klass() ? klass.to_s():"") + "\t" + (type() ? type.to_s():"") + "\t" + rdata_to_string
     end
     
     #Get a string representation of the data section of the RR (in zone file format)

data/lib/Dnsruby/select_thread.rb

@@ -58,6 +58,8 @@ module Dnsruby
         @@queued_responses=[]
         @@queued_validation_responses=[]
         @@wakeup_sockets = get_socket_pair
+        # Suppress reverse lookups
+        BasicSocket.do_not_reverse_lookup = true
         #    end
         # Now start the select thread
         @@select_thread = Thread.new {
@@ -236,9 +238,16 @@ module Dnsruby
           answerip = msg.answerip.downcase
           answerfrom = msg.answerfrom.downcase
           dest_server = query_settings.dest_server
+          answeripaddr = IPAddr.new(answerip)
+          dest_server = IPAddr.new("0.0.0.0")
+          begin
+          destserveripaddr = IPAddr.new(dest_server)
+          rescue ArgumentError
+            # Host name not IP address
+          end
           if (dest_server && (dest_server != '0.0.0.0') &&
-                (answerip != query_settings.dest_server.downcase) &&
-                (answerfrom != query_settings.dest_server.downcase))
+                (answeripaddr != destserveripaddr) &&
+                (answerfrom != dest_server))
             Dnsruby.log.warn("Unsolicited response received from #{answerip} instead of #{query_settings.dest_server}")
           else 
             send_response_to_client(msg, bytes, socket)
@@ -516,7 +525,11 @@ module Dnsruby
       # to send it out from its normal loop.
       Dnsruby.log.debug{"Pushing response to client queue direct from resolver or validator"}
       @@mutex.synchronize{
-        @@queued_responses.push([client_id, client_queue, msg, nil, query, res])
+        err = nil
+        if (msg.rcode == RCode.NXDOMAIN)
+          err = NXDomain.new
+        end
+        @@queued_responses.push([client_id, client_queue, msg, err, query, res])
       }
       # Make sure select loop is running!
       if (@@select_thread && @@select_thread.alive?)

data/lib/Dnsruby/validator_thread.rb

@@ -21,7 +21,7 @@ module Dnsruby
   class ValidatorThread # :nodoc: all
     #    include Singleton
     def initialize(*args)
-      @client_id, @client_queue, @response, @err, @query, @st, @res = args
+      @client_id, @client_queue, @response, @error, @query, @st, @res = args
       # Create the validation thread, and a queue to receive validation requests
       # Actually, need to have a thread per validator, as they make recursive calls.
       #      @@mutex = Mutex.new
@@ -59,7 +59,7 @@ module Dnsruby
       #        client_id, client_queue, response, err, query, st, res = item
       validated_ok = validate(@query, @response, @res)
 
-      validated_ok = false if @error
+      validated_ok = false if (@error && !(NXDomain === @error))
 
       cache_if_valid(@query, @response)
 

data/lib/Dnsruby/zone_reader.rb

@@ -332,8 +332,9 @@ module Dnsruby
       if ([Types::MX, Types::NS, Types::AFSDB, Types::NAPTR, Types::RT,
             Types::SRV, Types::CNAME, Types::MB, Types::MG, Types::MR,
             Types::PTR].include?type_was)
-        if (line[line.length-1, 1] != ".")
-          line = line + "." + @origin.to_s
+        #        if (line[line.length-1, 1] != ".")
+        if (!(/\.\z/ =~ line))
+          line = line + "." + @origin.to_s + "."
         end
       end
       # Other RRs have several names. These should be parsed by Dnsruby,

data/lib/dnsruby.rb

@@ -104,7 +104,7 @@ require 'Dnsruby/TheLog'
 module Dnsruby
 
   # @TODO@ Remember to update version in dnsruby.gemspec!
-  VERSION = 1.46
+  VERSION = 1.47
   def Dnsruby.version
     return VERSION
   end

data/test/tc_packet.rb

@@ -22,7 +22,7 @@ require 'dnsruby'
 include Dnsruby
 class TestPacket < Test::Unit::TestCase
   def test_packet
-    domain = "example.com"
+    domain = "example.com."
     type = "MX"
     klass = "IN"
       
@@ -48,43 +48,43 @@ class TestPacket < Test::Unit::TestCase
     assert(additional.length == 0, 'additional() works when empty'); #9
       
     packet.add_answer(RR.create(   { 
-          :name    => "a1.example.com", 
+          :name    => "a1.example.com.",
           :type    => Types.A,  
           :address => "10.0.0.1"}));
     assert_equal(1, packet.header.ancount, 'First push into answer section worked');      #10
       
       
-    ret = packet.answer.rrset("example.com", 'NSEC')
+    ret = packet.answer.rrset("example.com.", 'NSEC')
     assert_equal(ret.rrs.length, 0, "#{ret.rrs.length}")
     ret = packet.answer.rrset("a1.example.com", 'A')
     assert_equal(ret.rrs.length, 1, "#{ret.rrs.length}")
     ret = packet.answer.rrsets()
     assert_equal(ret.length, 1, "#{ret.length}")
     
-    packet.add_answer(RR.create({:name    => "a2.example.com",
+    packet.add_answer(RR.create({:name    => "a2.example.com.",
           :type    => "A", :address => "10.0.0.2"}));
     assert_equal(packet.header.ancount, 2, 'Second push into answer section worked');     #11
           
-    packet.add_authority(RR.create({:name    => "a3.example.com",
+    packet.add_authority(RR.create({:name    => "a3.example.com.",
           :type    => "A",
           :address => "10.0.0.3"}));
     assert_equal(1, packet.header.nscount, 'First push into authority section worked');   #12
       
       
     packet.add_authority(RR.create( {
-          :name    => "a4.example.com",
+          :name    => "a4.example.com.",
           :type    => "A",
           :address => "10.0.0.4"}));
     assert_equal(2, packet.header.nscount, 'Second push into authority section worked');  #13
       
     packet.add_additional(RR.create({
-          :name    => "a5.example.com",
+          :name    => "a5.example.com.",
           :type    => "A",
           :address => "10.0.0.5"}));
     assert_equal(1, packet.header.adcount, 'First push into additional section worked');  #14
       
     packet.add_additional(RR.create(  {
-          :name    => "a6.example.com",
+          :name    => "a6.example.com.",
           :type    => Types.A,
           :address => "10.0.0.6"}));
     assert_equal(2, packet.header.adcount, 'Second push into additional section worked'); #15
@@ -162,13 +162,13 @@ f4 00 31 04 64 6e 73 31 05 69 63 61 6e 6e 03 6f
   end    
   
   def get_test_packet
-    packet=Message.new("254.9.11.10.in-addr.arpa","PTR","IN")
+    packet=Message.new("254.9.11.10.in-addr.arpa.","PTR","IN")
       
-    packet.add_answer(RR.create(%q[254.9.11.10.in-addr.arpa 86400 IN PTR host-84-11-9-254.customer.example.com]));
+    packet.add_answer(RR.create(%q[254.9.11.10.in-addr.arpa. 86400 IN PTR host-84-11-9-254.customer.example.com.]));
       
-    packet.add_authority(RR.create("9.11.10.in-addr.arpa 86400 IN NS autons1.example.com"));
-    packet.add_authority(RR.create("9.11.10.in-addr.arpa 86400 IN NS autons2.example.com"));
-    packet.add_authority(RR.create("9.11.10.in-addr.arpa 86400 IN NS autons3.example.com"));
+    packet.add_authority(RR.create("9.11.10.in-addr.arpa. 86400 IN NS autons1.example.com."));
+    packet.add_authority(RR.create("9.11.10.in-addr.arpa. 86400 IN NS autons2.example.com."));
+    packet.add_authority(RR.create("9.11.10.in-addr.arpa. 86400 IN NS autons3.example.com."));
     return packet
   end
       

data/test/tc_resolver.rb

@@ -121,7 +121,7 @@ class TestResolver < Test::Unit::TestCase
     id, m, err = q.pop
     assert(id==1)
     assert(m.rcode == RCode.NXDOMAIN)
-    assert(err.kind_of?(NXDomain))
+    assert(NXDomain === err)
   end
   
   def test_timeouts

data/test/tc_rr-unknown.rb

@@ -66,9 +66,9 @@ class TestRrUnknown < Test::Unit::TestCase
     
     
     rr = RR.new_from_string('e.example IN TYPE4555 \# 4  0A0000 01  ')
-    assert_equal('e.example.	0	IN	TYPE4555	\# 4 0a000001', rr.to_s, 'Fully unknown RR parsed correctly')
+    assert_equal('e.example	0	IN	TYPE4555	\# 4 0a000001', rr.to_s, 'Fully unknown RR parsed correctly')
     
-    rr4 = RR.new_from_string('e.example CLASS122 TYPE4555 \# 4  0A0000 01  ')
+    rr4 = RR.new_from_string('e.example. CLASS122 TYPE4555 \# 4  0A0000 01  ')
     assert_equal('e.example.	0	CLASS122	TYPE4555	\# 4 0a000001', rr4.to_s, 'Fully unknown RR in unknown CLASS parsed correctly')
   end
   

data/test/tc_tcp.rb

@@ -14,11 +14,12 @@
 #limitations under the License.
 #++
 begin
-require 'rubygems'
+  require 'rubygems'
 rescue LoadError
 end
 require 'test/unit'
 require 'dnsruby'
+require 'socket'
 class TestTcp < Test::Unit::TestCase
   def test_TCP
     res = Dnsruby::Resolver.new()
@@ -27,12 +28,54 @@ class TestTcp < Test::Unit::TestCase
     assert(ret.is_a?(Dnsruby::Message))
   end
   def test_TCP_port
-    #@TODO@ Need a test server so we can tell what port this message was actually sent on!
+    # Need a test server so we can tell what port this message was actually sent on!
+    port = 59125
+    src_port = 57923
+    Dnsruby::PacketSender.clear_caches
+    received_port = nil
+    server_thread = Thread.new {
+      ts = TCPServer.new(port)
+      t = ts.accept
+      # Check that the source port was src_port
+      received_port = t.peeraddr()[1]
+      packet = t.recvfrom(2)[0]
+
+      len = (packet[0]<<8)+packet[1]
+      if (RUBY_VERSION >= "1.9")
+        len = (packet[0].getbyte(0)<<8)+packet[1].getbyte(0)# Ruby 1.9
+      end
+      packet = t.recvfrom(len)[0]
+      tcpPacket = Dnsruby::Message.decode(packet)
+      tcpPacket.header.tc = true
+      lenmsg = [tcpPacket.encode.length].pack('n')
+      t.send(lenmsg, 0)
+      t.write(tcpPacket.encode)
+      t.close
+      ts.close
+    }
+    ret = nil
+    client_thread = Thread.new {
+      res = Dnsruby::SingleResolver.new("127.0.0.1")
+      res.port = port
+      res.use_tcp = true
+      res.src_port=src_port
+      ret=res.query("example.com")
+    }
+    server_thread.join
+    client_thread.join
+    assert(received_port == src_port)
+      assert(ret.is_a?(Dnsruby::Message))
+  end
+  
+  def test_no_tcp
+    # Try to get a long response (which is truncated) and check that we have
+    # tc bit set
     res = Dnsruby::Resolver.new()
-    res.use_tcp = true
-    res.src_port=60123
-    ret=res.query("example.com")
-    assert(ret.is_a?(Dnsruby::Message))
+    res.udp_size = 512
+    res.no_tcp = true
+    ret = res.query("overflow.dnsruby.validation-test-servers.nominet.org.uk", Dnsruby::Types.TXT)
+    assert(ret.header.tc, "Message should be truncated with no TCP")
   end
+
   #@TODO@ Check stuff like persistent sockets
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dnsruby
 version: !ruby/object:Gem::Version 
-  version: "1.46"
+  version: "1.47"
 platform: ruby
 authors: 
 - AlexD
@@ -9,7 +9,7 @@ autorequire: dnsruby
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 +01:00
+date: 2010-05-19 00:00:00 +01:00
 default_executable: 
 dependencies: []