pNet-DNS 0.0.3 → 0.0.4

data/lib/Net/DNS/Resolver.rb

@@ -164,8 +164,8 @@ module Net
       # @TODO@ should get config working on Windows
       os = Config::CONFIG['host_os'] # e.g. "mswin32"
       if (os=='mswin32')
-      # Should we print a warning here? We don't *really* need the file...
-#        print "WARNING: You must have \\etc\\resolv.conf for Net::DNS to work correctly\n"
+        # Should we print a warning here? We don't *really* need the file...
+        #        print "WARNING: You must have \\etc\\resolv.conf for Net::DNS to work correctly\n"
       end
       # /etc/resolv.conf required
       
@@ -1594,9 +1594,9 @@ module Net
       #    socket = nil
       #
       def bgisready(socket)
-                ready = IO.select([socket], nil, nil, 0)
-                return ready!=nil
-#        return socket.ready? > 0
+        ready = IO.select([socket], nil, nil, 0)
+        return ready!=nil
+        #        return socket.ready? > 0
       end
       
       def make_query_packet(args)
@@ -1696,9 +1696,14 @@ module Net
         zone=[]
         
         if (axfr_start(args[0], args[1]))
-          rr, err = axfr_next, rr
-          while (rr && !err) do
-            zone.push(rr)
+          continueLoop= true
+          err = nil
+          while (continueLoop)
+            rr, err = axfr_next
+            continueLoop = rr!=nil && err==nil
+            if (continueLoop)
+              zone.push(rr)
+            end
           end
           zone = [] if err
         end
@@ -1809,8 +1814,9 @@ module Net
       def axfr_next
         err  = ''
         
-        unless (@axfr_rr)
-          unless (@axfr_sock)
+        # @todo this can't be right!!!
+        unless (@axfr_rr!=[])
+          unless (@axfr_sock!=nil)
             err = 'no zone transfer in progress'
             
             print ";; #{err}\n" if @debug
@@ -1820,12 +1826,13 @@ module Net
           end
           
           timeout = @tcp_timeout
+          sock = @axfr_sock
           
           #--------------------------------------------------------------
           # Read the length of the response packet.
           #--------------------------------------------------------------
           
-#          ready = sock.wait(timeout)
+          #          ready = sock.wait(timeout)
           ready = IO.select([sock], nil, nil, timeout)
           unless (ready)
             err = 'timeout';
@@ -1833,7 +1840,7 @@ module Net
             return nil, err
           end
           
-          buf, from = read_tcp(socket, Net::DNS::INT16SZ, @debug)
+          buf, from = read_tcp(sock, Net::DNS::INT16SZ, @debug)
           unless (buf.length > 0)
             err = 'truncated zone transfer'
             @errorstring=(err)
@@ -1852,25 +1859,25 @@ module Net
           #--------------------------------------------------------------
           
           ready = IO.select([sock], nil, nil, timeout)
-#          ready = sel.wait(timeout) # should be sock.wait, anyway!
+          #          ready = sel.wait(timeout) # should be sock.wait, anyway!
           unless (ready)
             err = 'timeout'
             @errorstring=(err)
             return nil, err
           end
           
-          buf, from = read_tcp(socket, len, @debug)
+          buf, from = read_tcp(sock, len, @debug)
           
-          print ';; received ' + buf.length +  " bytes\n" if @debug
+          print ';; received ' + buf.length.to_s +  " bytes\n" if @debug
           
           unless (buf.length == len)
-            err = "expected #{len} bytes, received " + buf.length
+            err = "expected #{len} bytes, received " + buf.length.to_s
             @errorstring=(err)
             print ";; #{err}\n" if @debug
             return nil, err
           end
           
-          ans, err = Net::DNS::Packet.new(buf, @debug)
+          ans, err = Net::DNS::Packet.new_from_binary(buf, @debug)
           
           if (ans)
             if (ans.header.rcode != 'NOERROR') 
@@ -1894,8 +1901,8 @@ module Net
           
           ans.answer.each do |rr|
             if (rr.type == 'SOA')
-              axfr_soa_count +=1
-              if (axfr_soa_count < 2)
+              @axfr_soa_count +=1
+              if (@axfr_soa_count < 2)
                 @axfr_rr.push(rr)
               end
             else
@@ -1914,7 +1921,7 @@ module Net
         
         rr = @axfr_rr.shift
         
-        return rr # , undef)
+        return rr # , nil)
       end
       
       def dnssec=(new_val)

data/test/tc_axfr.rb

@@ -0,0 +1,30 @@
+# The contents of this file are subject to the Mozilla
+# Public Licence Version 1.1 (the "Licence"); you may
+# not use this file except in compliance with the
+# Licence. You may obtain a copy of the Licence at
+# http://www.mozilla.org/MPL
+# Software distributed under the Licence is distributed
+# on an "AS IS" basis,  WITHOUT WARRANTY OF ANY KIND,
+# either express or implied. See the Licence of the
+# specific language governing rights and limitations
+# under the Licence.
+# The Original Code is pNet::DNS.
+# The Initial Developer of the Original Code is
+# Nominet UK (www.nominet.org.uk). Portions created by
+# Nominet UK are Copyright (c) Nominet UK 2006.
+# All rights reserved.
+require 'test/unit'
+require 'Net/DNS'
+require 'socket'
+class TestAxfr < Test::Unit::TestCase
+  def test_carlos
+    res = Net::DNS::Resolver.new()
+    res.nameservers=('ns1.net-dns.org')
+    res.debug=false
+    
+    zone = res.axfr("net-dns.org")
+    
+    assert(zone.size > 0)
+    
+  end
+end

data/test/ts_online.rb

@@ -26,6 +26,7 @@ begin
   require "test/tc_recurse.rb"
   require "test/tc_resolver.rb"
   require "test/tc_tcp.rb"
+  require "test/tc_axfr.rb"
 rescue Error
   puts "Cannot bind to socket:\n\t"+$!+"\n"
   puts "This is an indication you have network problems\n"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: pNet-DNS
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2006-12-14 00:00:00 +00:00
+  version: 0.0.4
+date: 2006-12-19 00:00:00 +00:00
 summary: Ruby port of perl Net::DNS
 require_paths: 
 - lib
@@ -31,6 +31,7 @@ authors:
 files: 
 - test/custom.txt
 - test/resolv.conf
+- test/tc_axfr.rb
 - test/tc_escapedchars.rb
 - test/tc_header.rb
 - test/tc_inet6.rb