pNet-DNS 1.0.1 → 1.0.2

data/lib/Net/DNS/RR/UNKNOWN.rb

@@ -1,18 +1,18 @@
-# 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.
+#--
+#Copyright 2007 Nominet UK
+#
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License. 
+#You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0 
+#
+#Unless required by applicable law or agreed to in writing, software 
+#distributed under the License is distributed on an "AS IS" BASIS, 
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+#See the License for the specific language governing permissions and 
+#limitations under the License.
+#++
 module Net
   module DNS
     class RR

data/lib/Net/DNS/RR/X25.rb

@@ -1,18 +1,18 @@
-# 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.
+#--
+#Copyright 2007 Nominet UK
+#
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License. 
+#You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0 
+#
+#Unless required by applicable law or agreed to in writing, software 
+#distributed under the License is distributed on an "AS IS" BASIS, 
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+#See the License for the specific language governing permissions and 
+#limitations under the License.
+#++
 module Net
   module DNS
     class RR

data/lib/Net/DNS/Resolver.rb

@@ -1,18 +1,18 @@
-# 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.
+#--
+#Copyright 2007 Nominet UK
+#
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License. 
+#You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0 
+#
+#Unless required by applicable law or agreed to in writing, software 
+#distributed under the License is distributed on an "AS IS" BASIS, 
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+#See the License for the specific language governing permissions and 
+#limitations under the License.
+#++
 
 require 'Net/DNS/Packet'
 require 'Net/DNS/Update'
@@ -1173,7 +1173,7 @@ module Net
         
         lastanswer=""
         
-        stop_time = Time.now + @udp_timeout if @udp_timeout
+        stop_time = Time.now + @udp_timeout if (@udp_timeout && @udp_timeout > 0)
         
         _reset_errorstring;
         
@@ -1298,8 +1298,10 @@ module Net
         #        ++i, retrans *= 2, timeout = int(retrans / (ns.length || 1)))
         @retry.times do |i|
           
+          if (i>0)         
+            retrans *= 2
+          end
           i += 1
-          retrans *= 2
           timeout = (retrans / (ns.length || 1)).to_int
           
           timeout = 1 if (timeout < 1)
@@ -1308,113 +1310,111 @@ module Net
           #                  NAMESERVER: foreach my $ns (@ns) {
           #          NAMESERVER: ns.each do |nstemp|
           ns.each do |nstemp|
-            catch(:nameserver) do
-              next if nstemp[3]!=nil
-              if (stop_time)
-                now = Time.now
-                if (stop_time < now)
-                  @errorstring=('query timed out')
-                  return;
-                end
-                if (timeout > 1 && timeout > (stop_time-now))
-                  timeout = stop_time-now;
-                end
+            next if nstemp[3]!=nil
+            if (stop_time)
+              now = Time.now
+              if (stop_time < now)
+                @errorstring=('query timed out')
+                return;
               end
-              nsname = nstemp[0]
-              nsaddr = nstemp[1]
-              nssockfamily = nstemp[2]
-              
-              # If we do not have a socket for the transport
-              # we are supposed to reach the namserver on we
-              # should skip it.
-              unless ((sock[ nssockfamily ])!=nil)
-                print "Send error: cannot reach #{nsname} (" +                
-                 ( (nssockfamily == 'AF_INET6') ? "IPv6" : "" ) +
-                 ( (nssockfamily == 'AF_INET') ? "IPv4" : "" ) +
-        				") not available" if @debug
-                
-                
-                @errorstring=("Send error: cannot reach #{nsname} (" +
-                 ( (nssockfamily == 'AF_INET6') ? "IPv6" : "" ) +
-                 ( (nssockfamily == 'AF_INET') ? "IPv4" : "" ) +
-        					       ") not available")
-                throw :nameserver
+              if (timeout > 1 && timeout > (stop_time-now))
+                timeout = stop_time-now;
               end
+            end
+            nsname = nstemp[0]
+            nsaddr = nstemp[1]
+            nssockfamily = nstemp[2]
+            
+            # If we do not have a socket for the transport
+            # we are supposed to reach the namserver on we
+            # should skip it.
+            unless ((sock[ nssockfamily ])!=nil)
+              print "Send error: cannot reach #{nsname} (" +                
+               ( (nssockfamily == 'AF_INET6') ? "IPv6" : "" ) +
+               ( (nssockfamily == 'AF_INET') ? "IPv4" : "" ) +
+        				") not available" if @debug
               
-              print ";; send_udp(#{nsname}:#{dstport})\n" if @debug
               
-              unless (sock[nssockfamily].send(packet_data, 0, nsaddr, @port))
-                print ";; send error: #{$!}\n" if @debug
-                @errorstring=("Send error: #{$!}")
-                nmbrnsfailed+=1
-                nstemp[3]="Send error" + @errorstring
-                next
-              end
-              
-              # See ticket 11931 but this works not quite yet
-              oldpacket_timeout=Time.now+timeout
-              until ( oldpacket_timeout && (oldpacket_timeout < Time.now))
-                #                      ready = sel.can_read(timeout)
-                ready = IO.select(select, nil, nil, timeout)
-                if (ready != nil)
-                  ready = ready[0]
-                  ready.each do |readytemp|
-                    catch(:selector) do
-                      buf = ''
-                      
-                      if (ret = readytemp.recvfrom(_packetsz))
-                        
-                        buf = ret[0]
-                        from = ret[1]
-                        @answerfrom=(from[2])
-                        @answersize=(buf.length)
-                        
-                        print ';; answer from ' + \
-                        from[2].inspect +  ':' + \
-                        from[3].inspect + ' : ' + \
-                        buf.length.inspect + " bytes\n" if @debug
-                        
-                        ans, err = Net::DNS::Packet.new_from_binary(buf, @debug)
-                        
-                        if (ans!= nil)
-                          throw :selector unless ( ans.header.qr || @ignqrid)
-                          throw :selector unless  ( (ans.header.id == packet.header.id) || @ignqrid )
-                          @errorstring=(ans.header.rcode)
-                          ans.answerfrom=(@answerfrom)
-                          ans.answersize=(@answersize)
-                          if (ans.header.rcode != "NOERROR" && ans.header.rcode != "NXDOMAIN")
-                            #                      # Remove this one from the stack
-                            
-                            print "RCODE: " + ans.header.rcode + "; trying next nameserver\n" if @debug
-                            nmbrnsfailed+=1
-                            nstemp[3]="RCODE: " + ans.header.rcode()
-                            lastanswer=ans
-                            throw :nameserver
-                          end
-                        elsif (err != nil)
-                          @errorstring=(err)
-                        end
+              @errorstring=("Send error: cannot reach #{nsname} (" +
+               ( (nssockfamily == 'AF_INET6') ? "IPv6" : "" ) +
+               ( (nssockfamily == 'AF_INET') ? "IPv4" : "" ) +
+        					       ") not available")
+              next
+            end
+            
+            print ";; send_udp(#{nsname}:#{dstport})\n" if @debug
+            
+            unless (sock[nssockfamily].send(packet_data, 0, nsaddr, @port))
+              print ";; send error: #{$!}\n" if @debug
+              @errorstring=("Send error: #{$!}")
+              nmbrnsfailed+=1
+              nstemp[3]="Send error" + @errorstring
+              next
+            end
+            
+            # See ticket 11931 but this works not quite yet
+            oldpacket_timeout=Time.now+timeout
+            while ( oldpacket_timeout > Time.now)
+              #                      ready = sel.can_read(timeout)
+              ready = IO.select(select, nil, nil, timeout)
+              if (ready != nil)
+                ready = ready[0]
+                ready.each do |readytemp|
+                  buf = ''
+                  
+                  if (ret = readytemp.recvfrom(_packetsz))
+                    
+                    buf = ret[0]
+                    from = ret[1]
+                    @answerfrom=(from[2])
+                    @answersize=(buf.length)
+                    
+                    print ';; answer from ' + \
+                    from[2].inspect +  ':' + \
+                    from[3].inspect + ' : ' + \
+                    buf.length.inspect + " bytes\n" if @debug
+                    
+                    ans, err = Net::DNS::Packet.new_from_binary(buf, @debug)
+                    
+                    if (ans!= nil)
+                      next unless ( ans.header.qr || @ignqrid)
+                      next unless  ( (ans.header.id == packet.header.id) || @ignqrid )
+                      @errorstring=(ans.header.rcode)
+                      ans.answerfrom=(@answerfrom)
+                      ans.answersize=(@answersize)
+                      if (ans.header.rcode != "NOERROR" && ans.header.rcode != "NXDOMAIN")
+                        #                      # Remove this one from the stack
                         
-                        return ans
-                      else
-                        @errorstring=($!)
-                        print ';; recv ERROR(' + \
-                        readytemp.peerhost + ':' + \
-                        readytemp.peerport + '): ' + \
-                        @errorstring + "\n" if @debug
-                        nstemp[3]="Recv error " + @errorstring
+                        print "RCODE: " + ans.header.rcode + "; trying next nameserver\n" if @debug
                         nmbrnsfailed+=1
-                        # We want to remain in the SELECTOR LOOP...
-                        # unless there are no more nameservers
-                        return unless (nmbrnsfailed < ns.length)
-                        print ';; Number of failed nameservers: #{nmbrnsfailed} out of ' + ns.length + "\n" if @debug
-                        
+                        nstemp[3]="RCODE: " + ans.header.rcode()
+                        lastanswer=ans
+                        #                          throw :nameserver
+                        break
                       end
-                    end # :selector
-                  end #SELECTOR LOOP
+                    elsif (err != nil)
+                      @errorstring=(err)
+                    end
+                    
+                    return ans
+                  else
+                    @errorstring=($!)
+                    print ';; recv ERROR(' + \
+                    readytemp.peerhost + ':' + \
+                    readytemp.peerport + '): ' + \
+                    @errorstring + "\n" if @debug
+                    nstemp[3]="Recv error " + @errorstring
+                    nmbrnsfailed+=1
+                    # We want to remain in the SELECTOR LOOP...
+                    # unless there are no more nameservers
+                    return unless (nmbrnsfailed < ns.length)
+                    print ';; Number of failed nameservers: #{nmbrnsfailed} out of ' + ns.length + "\n" if @debug
+                    
+                  end
                 end # not ready
-              end # until stop_time loop
-            end # :nameserver
+              end #SELECTOR LOOP
+            end # until stop_time loop
+            #           end # :nameserver
           end #NAMESERVER LOOP
         end # retry times
         
@@ -1496,7 +1496,7 @@ module Net
         begin
           # The AI_NUMERICHOST surpresses lookups.
           res = Socket::getaddrinfo(ns_address, dstport)[0] # , Socket::AF_UNSPEC, 
-                                    # Socket::SOCK_DGRAM, 0 , Socket::AI_NUMERICHOST)[0]
+          # Socket::SOCK_DGRAM, 0 , Socket::AI_NUMERICHOST)[0]
           
           sockfamily = res[0]
           socktype_tmp = res[1]

data/lib/Net/DNS/Resolver/Recurse.rb

@@ -1,18 +1,18 @@
-# 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.
+#--
+#Copyright 2007 Nominet UK
+#
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License. 
+#You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0 
+#
+#Unless required by applicable law or agreed to in writing, software 
+#distributed under the License is distributed on an "AS IS" BASIS, 
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+#See the License for the specific language governing permissions and 
+#limitations under the License.
+#++
 module Net
   module DNS
     class Resolver

data/lib/Net/DNS/Update.rb

@@ -1,18 +1,18 @@
-# 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.
+#--
+#Copyright 2007 Nominet UK
+#
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License. 
+#You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0 
+#
+#Unless required by applicable law or agreed to in writing, software 
+#distributed under the License is distributed on an "AS IS" BASIS, 
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+#See the License for the specific language governing permissions and 
+#limitations under the License.
+#++
 module Net
   module DNS
     #= NAME

data/test/tc_axfr.rb

@@ -1,18 +1,18 @@
-# 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.
+#--
+#Copyright 2007 Nominet UK
+#
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License. 
+#You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0 
+#
+#Unless required by applicable law or agreed to in writing, software 
+#distributed under the License is distributed on an "AS IS" BASIS, 
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+#See the License for the specific language governing permissions and 
+#limitations under the License.
+#++
 require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'

data/test/tc_escapedchars.rb

@@ -1,18 +1,18 @@
-# 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.
+#--
+#Copyright 2007 Nominet UK
+#
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License. 
+#You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0 
+#
+#Unless required by applicable law or agreed to in writing, software 
+#distributed under the License is distributed on an "AS IS" BASIS, 
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+#See the License for the specific language governing permissions and 
+#limitations under the License.
+#++
 require 'rubygems'
 require 'test/unit'
 require 'Net/DNS'