pNet-DNS 1.0.0 → 1.0.1

data/README

@@ -1,68 +1,70 @@
-pNet::DNS
----------
-
-Ruby port of perl Net::DNS.
-
-This project is a direct port of perl Net::DNS, version 0.57.
-It has tried to stick as closely as possible to the original
-perl code, to allow existing perl code to be ported quickly and
-easily to Ruby. This project is not intended to be anything more
-than a direct port of the perl code. 
-
-The perl test code has also been ported to Ruby, and all runs
-successfully. The demo code has also been ported.
-
-No effort has been made to fix bugs in the original perl code -
-this port is as close as possible to the perl.
-
-Author : AlexD
-Contact : alexd@nominet.org.uk
-Copyright (c) Nominet UK, 2006
-
-Check out demo and test folders for examples.
-
-Issues
-------
-
-I've still not had a chance to test on IPv6, so the functionality in
-tc_inet6.rb is untested.
-
-Nameserver.rb is a port of the perl version - bugs and all.
-It's obviously broken, but would not be hard to fix. 
-If you need a working version of this code, please contact me.
-
-Licensing
----------
-
-This project is licensed under the Mozilla Public License.
-
-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
-(http://www.nominet.org.uk).  Portions created by Nominet UK are
-Copyright (c) Nominet UK 2006.  All rights reserved.
-
-PERL AUTHOR INFORMATION
------------------------
-
-Net::DNS is currently maintained at NLnet Labs (www.nlnetlabs.nl) by:
-        Olaf Kolkman and his team.
-	olaf at net-dns.org
-
-Between 2002 and 2004 Net::DNS was maintained by:
-       Chris Reinhardt
-
-
-Net::DNS was created by:
-	Michael Fuhr
-	mike at fuhr.org 
+pNet::DNS
+---------
+
+Ruby port of perl Net::DNS.
+
+This project is a direct port of perl Net::DNS, version 0.57.
+It has tried to stick as closely as possible to the original
+perl code, to allow existing perl code to be ported quickly and
+easily to Ruby. This project is not intended to be anything more
+than a direct port of the perl code. 
+
+The perl test code has also been ported to Ruby, and all runs
+successfully. The demo code has also been ported.
+
+No effort has been made to fix bugs in the original perl code -
+this port is as close as possible to the perl.
+
+Author : AlexD
+Contact : alexd@nominet.org.uk
+Copyright (c) Nominet UK, 2006
+
+Check out demo and test folders for examples.
+
+Issues
+------
+
+I've still not had a chance to test on IPv6, so the functionality in
+tc_inet6.rb is untested.
+
+Nameserver.rb is a port of the perl version - bugs and all.
+It's obviously broken, but would not be hard to fix. 
+If you need a working version of this code, please contact me.
+
+JRuby does not yet support TCP, although UDP is fully supported.
+
+Licensing
+---------
+
+This project is licensed under the Mozilla Public License.
+
+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
+(http://www.nominet.org.uk).  Portions created by Nominet UK are
+Copyright (c) Nominet UK 2006.  All rights reserved.
+
+PERL AUTHOR INFORMATION
+-----------------------
+
+Net::DNS is currently maintained at NLnet Labs (www.nlnetlabs.nl) by:
+        Olaf Kolkman and his team.
+	olaf at net-dns.org
+
+Between 2002 and 2004 Net::DNS was maintained by:
+       Chris Reinhardt
+
+
+Net::DNS was created by:
+	Michael Fuhr
+	mike at fuhr.org 

data/lib/Net/DNS/Resolver.rb

@@ -647,7 +647,16 @@ module Net
       def read_config_file(conf_file)
         ns=[]
         searchlist=[]
-        
+        if !(File.exist? conf_file)
+          if (/java/ =~ RUBY_PLATFORM && !(conf_file=~/:/))
+            # Problem with paths and Windows on JRuby - see if we can munge the drive...
+            wd = Dir.getwd
+            drive = wd.split(':')[0]
+            if (drive.length==1)
+              conf_file = drive << ":" << conf_file
+            end
+          end
+        end
         IO.foreach(conf_file) do |line|
           line.gsub!(/\s*[;#].*/,"")
           next unless line =~ /\S/
@@ -795,8 +804,8 @@ module Net
         return addr;
       end
       
-      # if ($self->{"udppacketsize"}  > Net::DNS::PACKETSZ() 
-      # then we use EDNS and $self->{"udppacketsize"} 
+      # if (@udppacketsize  > Net::DNS::PACKETSZ() 
+      # then we use EDNS and @udppacketsize
       # should be taken as the maximum packet_data length
       def _packetsz
         ret = (@udppacketsize > Net::DNS::PACKETSZ ? @udppacketsize : Net::DNS::PACKETSZ) 
@@ -1251,8 +1260,8 @@ module Net
             next
           end
           begin
-            res = Socket::getaddrinfo(ns_address, dstport, Socket::AF_UNSPEC, Socket::SOCK_DGRAM, 
-                                      0, Socket::AI_NUMERICHOST)[0]
+            res = Socket::getaddrinfo(ns_address, dstport)[0] # , Socket::AF_UNSPEC, Socket::SOCK_DGRAM, 
+            # 0, Socket::AI_NUMERICHOST)[0]
             
             
             sockfamily = res[0]
@@ -1486,8 +1495,8 @@ module Net
         
         begin
           # The AI_NUMERICHOST surpresses lookups.
-          res = Socket::getaddrinfo(ns_address, dstport, Socket::AF_UNSPEC, 
-                                    Socket::SOCK_DGRAM, 0 , Socket::AI_NUMERICHOST)[0]
+          res = Socket::getaddrinfo(ns_address, dstport)[0] # , Socket::AF_UNSPEC, 
+                                    # Socket::SOCK_DGRAM, 0 , Socket::AI_NUMERICHOST)[0]
           
           sockfamily = res[0]
           socktype_tmp = res[1]
@@ -1627,37 +1636,35 @@ module Net
         
         if (@dnssec)
           # RFC 3225
-          print ";; Adding EDNS extention with UDP packetsize #{@udppacketsize} and DNS OK bit set\n" 
-          if @debug
-            
-            optrr = Net::DNS::RR.create({
-              :type         => 'OPT',
-              :name         => '',
-              :rrclass        => @udppacketsize,  # Decimal UDPpayload
-              :ednsflags    => 0x8000, # first bit set see RFC 3225 
-            })
-            
-            packet.push('additional', optrr)
-            
-          elsif (@udppacketsize > Net::DNS::PACKETSZ)
-            print ";; Adding EDNS extention with UDP packetsize  #{@udppacketsize}.\n" if @debug
-            # RFC 3225
-            optrr = Net::DNS::RR.create( {
-              :type         => 'OPT',
-              :name         => '',
-              :rrclass        => @udppacketsize,  # Decimal UDPpayload
-              :ttl          => 0x0000 # RCODE 32bit Hex
-            })
-            
-            packet.push('additional', optrr)
-          end
+          print ";; Adding EDNS extention with UDP packetsize #{@udppacketsize} and DNS OK bit set\n"  if @debug
           
+          optrr = Net::DNS::RR.create({
+            :type         => 'OPT',
+            :name         => '',
+            :rrclass        => @udppacketsize,  # Decimal UDPpayload
+            :ednsflags    => 0x8000, # first bit set see RFC 3225 
+          })
           
-          if (@tsig_rr != nil && @tsig_rr.length > 0)
-            #          if (!grep { $_.type == 'TSIG' } packet.additional)
-            if (packet.additional.select { |i| i.type == 'TSIG' }.length > 0)
-              packet.push('additional', @tsig_rr)
-            end
+          packet.push('additional', optrr)
+          
+        elsif (@udppacketsize > Net::DNS::PACKETSZ)
+          print ";; Adding EDNS extention with UDP packetsize  #{@udppacketsize}.\n" if @debug
+          # RFC 3225
+          optrr = Net::DNS::RR.create( {
+            :type         => 'OPT',
+            :name         => '',
+            :rrclass        => @udppacketsize,  # Decimal UDPpayload
+            :ttl          => 0x0000 # RCODE 32bit Hex
+          })
+          
+          packet.push('additional', optrr)
+        end
+        
+        
+        if (@tsig_rr != nil && @tsig_rr.length > 0)
+          #          if (!grep { $_.type == 'TSIG' } packet.additional)
+          if (packet.additional.select { |i| i.type == 'TSIG' }.length > 0)
+            packet.push('additional', @tsig_rr)
           end
         end
         
@@ -2044,11 +2051,20 @@ module Net
           
           srcaddr6 = srcaddr == '0.0.0.0' ? '::' : srcaddr
           
-          sock = Socket.new( Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
-          sockaddr = Socket.pack_sockaddr_in( srcport, srcaddr6 )
-          sock.bind( sockaddr )
-          sockaddr = Socket.pack_sockaddr_in( dstport, ns )
-          sock.connect(sockaddr)
+          sock=nil
+          if (/java/=~RUBY_PLATFORM)
+            sock = TCPSocket.new(ns, dstport, srcaddr, srcport)
+            #    We need to use Socket.new rather than TCPSocket.new because of 
+            #    a bug with TCPSocket#recvfrom in Windows
+            #    But this breaks JRuby
+          else
+            sock = Socket.new( Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
+            sockaddr = Socket.pack_sockaddr_in( srcport, srcaddr6 )
+            sock.bind( sockaddr )
+            sockaddr = Socket.pack_sockaddr_in( dstport, ns )
+            sock.connect(sockaddr)
+          end
+          
           if sock==nil
             @errorstring=('connection failed(IPv6 socket failure)')
             print ";; ERROR: send_tcp: IPv6 connection to #{ns}" + 
@@ -2073,11 +2089,19 @@ module Net
           end
           
           
-          sock = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
-          sockaddr = Socket.pack_sockaddr_in( srcport, srcaddr )
-          sock.bind( sockaddr )
-          sockaddr = Socket.pack_sockaddr_in( dstport, ns )
-          sock.connect(sockaddr)
+          sock=nil
+          if (/java/=~RUBY_PLATFORM)
+            sock = TCPSocket.new(ns, dstport, srcaddr, srcport)
+            #    We need to use Socket.new rather than TCPSocket.new because of 
+            #    a bug with TCPSocket#recvfrom in Windows
+            #    But this breaks JRuby
+          else
+            sock = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+            sockaddr = Socket.pack_sockaddr_in( srcport, srcaddr )
+            sock.bind( sockaddr )
+            sockaddr = Socket.pack_sockaddr_in( dstport, ns )
+            sock.connect(sockaddr)
+          end
           
           
         end

data/test/tc_axfr.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 require 'socket'

data/test/tc_escapedchars.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestEscapedChars < Test::Unit::TestCase

data/test/tc_header.rb

@@ -1,91 +1,92 @@
-# 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'
-class TestHeader < Test::Unit::TestCase
-  def test_header
-    header = Net::DNS::Header.new();
-    assert(header, "new() returned something")
-    
-    header.id=41
-    assert_equal(header.id, 41, "id() works")
-    
-    header.qr=1
-    assert_equal(header.qr, 1, "qr() works")
-    
-    header.opcode="QUERY"
-    assert_equal(header.opcode, "QUERY", "opcode() works")
-    
-    header.aa=1
-    assert_equal(header.aa, 1, "aa() works")
-    
-    header.tc=0
-    assert_equal(header.tc, 0, "tc() works")
-    
-    header.rd=1
-    assert_equal(header.rd, 1, "rd() works")
-    
-    header.ra=1
-    assert_equal(header.ra, 1, "ra() works")
-    
-    header.qr=1
-    assert_equal(header.qr, 1, "qr() works")
-    
-    header.rcode="NOERROR"
-    assert_equal(header.rcode, "NOERROR", "rcode() works")
-    
-    header.qdcount=1
-    header.ancount=2
-    header.nscount=3
-    header.arcount=3
-    
-    
-    # Reenable when support for CD is there
-    #header.cd=0
-    #assert_equal(header.cd, 0, "cd() works")
-    puts(header.inspect)
-    data = header.data;
-    
-    header2 = Net::DNS::Header.new(data);
-    puts(header2.inspect)
-    
-    assert(header==(header2), 'Headers are the same');
-    
-    #
-    #  Is $header->string remotely sane?
-    #
-    assert(header.inspect =~ /opcode = QUERY/, 'string() has opcode correct');
-    assert(header.inspect =~ /ancount = 2/,    'string() has ancount correct');
-    
-    header = Net::DNS::Header.new;
-    
-    #
-    # Check that the aliases work properly.
-    #
-    header.zocount=(0);
-    header.prcount=(1);
-    header.upcount=(2);
-    header.adcount=(3);
-    
-    assert_equal(header.zocount, 0, 'zocount works');
-    assert_equal(header.prcount, 1, 'prcount works');
-    assert_equal(header.upcount, 2, 'upcount works');
-    assert_equal(header.adcount, 3, 'adcount works');
-    
-    
-    
-  end
-end
+# 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 'rubygems'
+require 'test/unit'
+require 'Net/DNS'
+class TestHeader < Test::Unit::TestCase
+  def test_header
+    header = Net::DNS::Header.new();
+    assert(header, "new() returned something")
+    
+    header.id=41
+    assert_equal(header.id, 41, "id() works")
+    
+    header.qr=1
+    assert_equal(header.qr, 1, "qr() works")
+    
+    header.opcode="QUERY"
+    assert_equal(header.opcode, "QUERY", "opcode() works")
+    
+    header.aa=1
+    assert_equal(header.aa, 1, "aa() works")
+    
+    header.tc=0
+    assert_equal(header.tc, 0, "tc() works")
+    
+    header.rd=1
+    assert_equal(header.rd, 1, "rd() works")
+    
+    header.ra=1
+    assert_equal(header.ra, 1, "ra() works")
+    
+    header.qr=1
+    assert_equal(header.qr, 1, "qr() works")
+    
+    header.rcode="NOERROR"
+    assert_equal(header.rcode, "NOERROR", "rcode() works")
+    
+    header.qdcount=1
+    header.ancount=2
+    header.nscount=3
+    header.arcount=3
+    
+    
+    # Reenable when support for CD is there
+    #header.cd=0
+    #assert_equal(header.cd, 0, "cd() works")
+    puts(header.inspect)
+    data = header.data;
+    
+    header2 = Net::DNS::Header.new(data);
+    puts(header2.inspect)
+    
+    assert(header==(header2), 'Headers are the same');
+    
+    #
+    #  Is $header->string remotely sane?
+    #
+    assert(header.inspect =~ /opcode = QUERY/, 'string() has opcode correct');
+    assert(header.inspect =~ /ancount = 2/,    'string() has ancount correct');
+    
+    header = Net::DNS::Header.new;
+    
+    #
+    # Check that the aliases work properly.
+    #
+    header.zocount=(0);
+    header.prcount=(1);
+    header.upcount=(2);
+    header.adcount=(3);
+    
+    assert_equal(header.zocount, 0, 'zocount works');
+    assert_equal(header.prcount, 1, 'prcount works');
+    assert_equal(header.upcount, 2, 'upcount works');
+    assert_equal(header.adcount, 3, 'adcount works');
+    
+    
+    
+  end
+end

data/test/tc_inet6.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 require 'socket'

data/test/tc_misc.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestMisc < Test::Unit::TestCase

data/test/tc_online.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 require 'socket'

data/test/tc_packet.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestPacket < Test::Unit::TestCase

data/test/tc_packet_unique_push.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestPacketUniquePush < Test::Unit::TestCase

data/test/tc_question.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestQuestion < Test::Unit::TestCase

data/test/tc_recurse.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 require 'Net/DNS/Resolver/Recurse'

data/test/tc_res_env.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestResolverEnv < Test::Unit::TestCase

data/test/tc_res_file.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestAResolverFile < Test::Unit::TestCase

data/test/tc_res_opt.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestResOpt < Test::Unit::TestCase

data/test/tc_resolver.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestResolver < Test::Unit::TestCase

data/test/tc_rr-opt.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestRrOpt < Test::Unit::TestCase

data/test/tc_rr-rrsort.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestRrRrSort < Test::Unit::TestCase

data/test/tc_rr-txt.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestRrTest < Test::Unit::TestCase

data/test/tc_rr-unknown.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestRrUnknown < Test::Unit::TestCase

data/test/tc_rr.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestRR < Test::Unit::TestCase

data/test/tc_tcp.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestTcp < Test::Unit::TestCase

data/test/tc_thread.rb

@@ -0,0 +1,34 @@
+require 'rubygems'
+require 'Net/DNS'
+
+class TestOnline < Test::Unit::TestCase
+  def run_threads(d) 
+    ts = []
+    15.times do  |i|
+      t = Thread.new {
+        begin
+          p "Querying " + i.to_s
+          p d.query("nominet.org.uk")
+        rescue (Exception) 
+          p "Exception "
+        end
+      }
+      ts.push(t)
+    end
+    15.times do |i|
+      ts[i].join
+    end
+  end
+  
+  def test_non_persistent
+    d = Net::DNS::Resolver.new(:nameserver => "213.248.199.17")
+    d.persistent_udp=false
+    run_threads(d)
+  end
+  
+  def test_persistent
+    d = Net::DNS::Resolver.new(:nameserver => "213.248.199.17")
+    d.persistent_udp=true
+    run_threads(d)
+  end
+end  

data/test/tc_tkey.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 require "digest/md5"
@@ -89,7 +90,7 @@ class TestTKey < Test::Unit::TestCase
     :key         => key,
     :sign_func   => Proc.new { |key,data|     
    #         OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new("md5"), key, data) 
-        hmac = Digest::MD5.new(key)
+        hmac = Digest::MD5.new.update(key)
         hmac.update(data)
         return hmac.digest
         },

data/test/tc_udp.rb

@@ -0,0 +1,35 @@
+# 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 'rubygems'
+require 'test/unit'
+require 'Net/DNS'
+class TestTcp < Test::Unit::TestCase
+  def test_TCP
+    res = Net::DNS::Resolver.new(:config_file=>"/etc/resolv.conf")
+    res.debug=true
+    res.usevc = false
+    ret=res.query("example.com")
+    assert(ret.is_a?(Net::DNS::Packet))
+  end
+  def test_TCP_port
+    res = Net::DNS::Resolver.new(:config_file=>"/etc/resolv.conf")
+    res.debug=true
+    res.usevc = false
+    res.srcport=rand(60000) + 1025
+    ret=res.query("example.com")
+    assert(ret.is_a?(Net::DNS::Packet))
+  end
+end

data/test/tc_update.rb

@@ -13,6 +13,7 @@
 # Nominet UK (www.nominet.org.uk). Portions created by
 # Nominet UK are Copyright (c) Nominet UK 2006.
 # All rights reserved.
+require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'
 class TestUpdate < Test::Unit::TestCase

data/test/ts_online.rb

@@ -1,34 +1,34 @@
-# 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"
-# Disable these tests if we're not online
-require 'socket'
-sock = UDPSocket.new()
-begin
-  sock.connect('193.0.14.129', # k.root-servers.net.
-          '25')
-  # OK - online and ready to go
-  require "test/tc_inet6.rb"
-  require "test/tc_online.rb"
-  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"
-  puts "\n\nNo online tests will be run!!\n\n"
-end
+# 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"
+# Disable these tests if we're not online
+require 'socket'
+sock = UDPSocket.new()
+begin
+  sock.connect('193.0.14.129', # k.root-servers.net.
+          25)
+  # OK - online and ready to go
+  require "test/tc_inet6.rb"
+  require "test/tc_online.rb"
+  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"
+  puts "\n\nNo online tests will be run!!\n\n"
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: pNet-DNS
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-05-29 00:00:00 +01:00
+  version: 1.0.1
+date: 2007-07-12 00:00:00 +01:00
 summary: Ruby port of perl Net::DNS
 require_paths: 
 - lib
@@ -51,24 +51,23 @@ files:
 - test/tc_rr-unknown.rb
 - test/tc_rr.rb
 - test/tc_tcp.rb
+- test/tc_thread.rb
 - test/tc_tkey.rb
+- test/tc_udp.rb
 - test/tc_update.rb
 - test/ts_netdns.rb
 - test/ts_offline.rb
 - test/ts_online.rb
 - lib/Net
 - lib/Net/DNS
-- lib/Net/DNS.rb
 - lib/Net/DNS/Header.rb
 - lib/Net/DNS/Nameserver.rb
 - lib/Net/DNS/Packet.rb
 - lib/Net/DNS/Question.rb
 - lib/Net/DNS/Resolver
+- lib/Net/DNS/Resolver/Recurse.rb
 - lib/Net/DNS/Resolver.rb
 - lib/Net/DNS/RR
-- lib/Net/DNS/RR.rb
-- lib/Net/DNS/Update.rb
-- lib/Net/DNS/Resolver/Recurse.rb
 - lib/Net/DNS/RR/A.rb
 - lib/Net/DNS/RR/AAAA.rb
 - lib/Net/DNS/RR/AFSDB.rb
@@ -103,6 +102,9 @@ files:
 - lib/Net/DNS/RR/TXT.rb
 - lib/Net/DNS/RR/UNKNOWN.rb
 - lib/Net/DNS/RR/X25.rb
+- lib/Net/DNS/RR.rb
+- lib/Net/DNS/Update.rb
+- lib/Net/DNS.rb
 - README
 test_files: 
 - test/ts_offline.rb