dnsruby 1.55 → 1.56.0

data/lib/{Dnsruby → dnsruby}/resource/generic.rb

@@ -1,52 +1,52 @@
-#--
-#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.
-#++
+# --
+# 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 Dnsruby
   class RR
-    #Class to store generic RRs (RFC 3597)
+    # Class to store generic RRs (RFC 3597)
     class Generic < RR # RFC 3597
-      #data for the generic resource record
+      # data for the generic resource record
       attr_reader :data
-      
+
       def from_data(data) #:nodoc: all
         @data = data[0]
       end
-      
+
       def rdata_to_string #:nodoc: all
         if (@data!=nil)
           return  "\\# " +  @data.length.to_s +  " " + @data.unpack("H*")[0]
         end
         return "#NO DATA"
       end
-      
+
       def from_string(data) #:nodoc: all
         @data = data
       end
-      
+
       def encode_rdata(msg, canonical=false) #:nodoc: all
         msg.put_bytes(data)
       end
-      
+
       def self.decode_rdata(msg) #:nodoc: all
         return self.new(msg.get_bytes)
       end
-      
+
       def self.create(type_value, class_value) #:nodoc:
         c = Class.new(Generic)
-        #          c.type = type_value
-        #          c.klass = class_value
+        #           c.type = type_value
+        #           c.klass = class_value
         c.const_set(:TypeValue, type_value)
         c.const_set(:ClassValue, class_value)
         Generic.const_set("Type#{type_value}_Class#{class_value}", c)
@@ -54,22 +54,22 @@ module Dnsruby
         return c
       end
     end
-    
-    #--
-    # Standard (class generic) RRs
-    #++
-    #NS RR
-    #Nameserver resource record
+
+    # --
+    #  Standard (class generic) RRs
+    # ++
+    # NS RR
+    # Nameserver resource record
     class NS < DomainName
       ClassValue = nil #:nodoc: all
       TypeValue = Types::NS #:nodoc: all
-      
+
       alias nsdname domainname
       alias nsdname= domainname=
     end
-    
-    #CNAME RR
-    #The canonical name for an alias
+
+    # CNAME RR
+    # The canonical name for an alias
     class CNAME < DomainName
       ClassValue = nil #:nodoc: all
       TypeValue = Types::CNAME #:nodoc: all
@@ -77,48 +77,48 @@ module Dnsruby
       alias cname domainname
       alias cname= domainname=
     end
-    
-    #DNAME RR
+
+    # DNAME RR
     class DNAME < DomainName
       ClassValue = nil #:nodoc: all
       TypeValue = Types::DNAME #:nodoc: all
-      
+
       alias dname domainname
       alias dname= domainname=
     end
-    
-    #MB RR
+
+    # MB RR
     class MB < DomainName
       ClassValue = nil #:nodoc: all
       TypeValue = Types::MB #:nodoc: all
       alias madname domainname
       alias madname= domainname=
     end
-    
-    #MG RR
+
+    # MG RR
     class MG < DomainName
       ClassValue = nil #:nodoc: all
       TypeValue = Types::MG #:nodoc: all
       alias mgmname domainname
       alias mgmname= domainname=
     end
-    
-    #MR RR
+
+    # MR RR
     class MR < DomainName
       ClassValue = nil #:nodoc: all
       TypeValue = Types::MR #:nodoc: all
       alias newname domainname
       alias newname= domainname=
     end
-    
-    #PTR RR
+
+    # PTR RR
     class PTR < DomainName
       ClassValue = nil #:nodoc: all
       TypeValue = Types::PTR #:nodoc: all
     end
-    
-    #ANY RR
-    # A Query type requesting any RR
+
+    # ANY RR
+    #  A Query type requesting any RR
     class ANY < RR
       ClassValue = nil #:nodoc: all
       TypeValue = Types::ANY #:nodoc: all
@@ -131,35 +131,35 @@ module Dnsruby
       def from_data(data)
       end
     end
-  end  
+  end
 end
-require 'Dnsruby/resource/HINFO'
-require 'Dnsruby/resource/MINFO'
-require 'Dnsruby/resource/ISDN'
-require 'Dnsruby/resource/MX'
-require 'Dnsruby/resource/NAPTR'
-require 'Dnsruby/resource/NSAP'
-require 'Dnsruby/resource/PX'
-require 'Dnsruby/resource/RP'
-require 'Dnsruby/resource/RT'
-require 'Dnsruby/resource/SOA'
-require 'Dnsruby/resource/TXT'
-require 'Dnsruby/resource/X25'
-require 'Dnsruby/resource/SPF'
-require 'Dnsruby/resource/CERT'
-require 'Dnsruby/resource/LOC'
-require 'Dnsruby/resource/OPT'
-require 'Dnsruby/resource/TSIG'
-require 'Dnsruby/resource/TKEY'
-require 'Dnsruby/resource/DNSKEY'
-require 'Dnsruby/resource/RRSIG'
-require 'Dnsruby/resource/NSEC'
-require 'Dnsruby/resource/DS'
-require 'Dnsruby/resource/NSEC3'
-require 'Dnsruby/resource/NSEC3PARAM'
-require 'Dnsruby/resource/DLV'
-require 'Dnsruby/resource/SSHFP'
-require 'Dnsruby/resource/IPSECKEY'
-require 'Dnsruby/resource/HIP'
-require 'Dnsruby/resource/KX'
-require 'Dnsruby/resource/DHCID'
+require 'dnsruby/resource/HINFO'
+require 'dnsruby/resource/MINFO'
+require 'dnsruby/resource/ISDN'
+require 'dnsruby/resource/MX'
+require 'dnsruby/resource/NAPTR'
+require 'dnsruby/resource/NSAP'
+require 'dnsruby/resource/PX'
+require 'dnsruby/resource/RP'
+require 'dnsruby/resource/RT'
+require 'dnsruby/resource/SOA'
+require 'dnsruby/resource/TXT'
+require 'dnsruby/resource/X25'
+require 'dnsruby/resource/SPF'
+require 'dnsruby/resource/CERT'
+require 'dnsruby/resource/LOC'
+require 'dnsruby/resource/OPT'
+require 'dnsruby/resource/TSIG'
+require 'dnsruby/resource/TKEY'
+require 'dnsruby/resource/DNSKEY'
+require 'dnsruby/resource/RRSIG'
+require 'dnsruby/resource/NSEC'
+require 'dnsruby/resource/DS'
+require 'dnsruby/resource/NSEC3'
+require 'dnsruby/resource/NSEC3PARAM'
+require 'dnsruby/resource/DLV'
+require 'dnsruby/resource/SSHFP'
+require 'dnsruby/resource/IPSECKEY'
+require 'dnsruby/resource/HIP'
+require 'dnsruby/resource/KX'
+require 'dnsruby/resource/DHCID'

data/lib/dnsruby/resource/resource.rb

@@ -0,0 +1,25 @@
+# --
+# 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 Dnsruby
+  ClassHash = {} #:nodoc: all
+
+
+end
+require 'dnsruby/resource/RRSet'
+require 'dnsruby/resource/RR'
+require 'dnsruby/resource/domain_name'
+require 'dnsruby/resource/generic'
+require 'dnsruby/resource/IN'

data/lib/{Dnsruby → dnsruby}/select_thread.rb

@@ -1,54 +1,54 @@
-#--
-#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.
-#++
+# --
+# 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 'socket'
-#require 'thread'
+# require 'thread'
 begin
   require 'fastthread'
 rescue LoadError
   require 'thread'
 end
 require 'singleton'
-require 'Dnsruby/validator_thread.rb'
+require 'dnsruby/validator_thread.rb'
 module Dnsruby
   Thread::abort_on_exception = true
   class SelectThread #:nodoc: all
     class SelectWakeup < RuntimeError; end
     include Singleton
-    # This singleton class runs a continuous select loop which 
-    # listens for responses on all of the in-use sockets.
-    # When a new query is sent, the thread is woken up, and
-    # the socket is added to the select loop (and the new timeout
-    # calculated).
-    # Note that a combination of the socket and the packet ID is
-    # sufficient to uniquely identify the query to the select thread.
+    #  This singleton class runs a continuous select loop which
+    #  listens for responses on all of the in-use sockets.
+    #  When a new query is sent, the thread is woken up, and
+    #  the socket is added to the select loop (and the new timeout
+    #  calculated).
+    #  Note that a combination of the socket and the packet ID is
+    #  sufficient to uniquely identify the query to the select thread.
     # 
-    # But how do we find the response queue for a particular query?
-    # Hash of client_id->[query, client_queue, socket]
-    # and socket->[client_id]
+    #  But how do we find the response queue for a particular query?
+    #  Hash of client_id->[query, client_queue, socket]
+    #  and socket->[client_id]
     # 
-    # @todo@ should we implement some of cancel function?
-    
+    #  @todo@ should we implement some of cancel function?
+
     def initialize
       @@mutex = Mutex.new
       @@mutex.synchronize {
         @@in_select=false
-        #        @@notifier,@@notified=IO.pipe
+        #         @@notifier,@@notified=IO.pipe
         @@sockets = [] # @@notified]
         @@timeouts = Hash.new
-        #    @@mutex.synchronize do
+        #     @@mutex.synchronize do
         @@query_hash = Hash.new
         @@socket_hash = Hash.new
         @@observers = Hash.new
@@ -60,20 +60,20 @@ module Dnsruby
         @@wakeup_sockets = get_socket_pair
         @@sockets << @@wakeup_sockets[1]
 
-        # Suppress reverse lookups
+        #  Suppress reverse lookups
         BasicSocket.do_not_reverse_lookup = true
-        #    end
-        # Now start the select thread
+        #     end
+        #  Now start the select thread
         @@select_thread = Thread.new {
           do_select
         }
-        #        # Start the validator thread
-        #        @@validator = ValidatorThread.instance
+        #         # Start the validator thread
+        #         @@validator = ValidatorThread.instance
       }
     end
-    
+
     def get_socket_pair
-      # Emulate socketpair on platforms which don't support it
+      #  Emulate socketpair on platforms which don't support it
       srv = nil
       begin
         srv = TCPServer.new('localhost', 0)
@@ -94,8 +94,8 @@ module Dnsruby
       attr_accessor :query_bytes, :query, :ignore_truncation, :client_queue,
         :client_query_id, :socket, :dest_server, :dest_port, :endtime, :udp_packet_size,
         :single_resolver
-      # new(query_bytes, query, ignore_truncation, client_queue, client_query_id,
-      #     socket, dest_server, dest_port, endtime, , udp_packet_size, single_resolver)
+      #  new(query_bytes, query, ignore_truncation, client_queue, client_query_id,
+      #      socket, dest_server, dest_port, endtime, , udp_packet_size, single_resolver)
       def initialize(*args)
         @query_bytes = args[0]
         @query = args[1]
@@ -110,13 +110,13 @@ module Dnsruby
         @single_resolver = args[10]
       end
     end
-    
+
     def add_to_select(query_settings)
-      # Add the query to sockets, and then wake the select thread up
+      #  Add the query to sockets, and then wake the select thread up
       @@mutex.synchronize {
         check_select_thread_synchronized
-        # @TODO@ This assumes that all client_query_ids are unique!
-        # Would be a good idea at least to check this...
+        #  @TODO@ This assumes that all client_query_ids are unique!
+        #  Would be a good idea at least to check this...
         @@query_hash[query_settings.client_query_id]=query_settings
         @@socket_hash[query_settings.socket]=[query_settings.client_query_id] # @todo@ If we use persistent sockets then we need to update this array
         @@timeouts[query_settings.client_query_id]=query_settings.endtime
@@ -125,10 +125,10 @@ module Dnsruby
       begin
         @@wakeup_sockets[0].send("wakeup!", 0)
       rescue Exception => e
-        #         do nothing
+        #          do nothing
       end
     end
-    
+
     def check_select_thread_synchronized
       if (!@@select_thread.alive?)
         Dnsruby.log.debug{"Restarting select thread"}
@@ -137,7 +137,7 @@ module Dnsruby
         }
       end
     end
-    
+
     def select_thread_alive?
       ret=true
       @@mutex.synchronize{
@@ -145,7 +145,7 @@ module Dnsruby
       }
       return ret
     end
-    
+
     def do_select
       unused_loop_count = 0
       last_tick_time = Time.now - 10
@@ -179,14 +179,14 @@ module Dnsruby
         if (has_observer && (timeout > tick_time))
           timeout = tick_time
         end
-        #        next if (timeout < 0)
+        #         next if (timeout < 0)
         begin
           ready, write, errors = IO.select(sockets, nil, nil, timeout)
         rescue SelectWakeup
-          # If SelectWakeup, then just restart this loop - the select call will be made with the new data
+          #  If SelectWakeup, then just restart this loop - the select call will be made with the new data
           next
         rescue IOError => e# Don't worry if the socket was closed already
-          #          print "IO Error  =: #{e}\n"
+          #           print "IO Error  =: #{e}\n"
           next
         end
         if ready && ready.include?(@@wakeup_sockets[1])
@@ -197,17 +197,17 @@ module Dnsruby
               wakeup_msg = @@wakeup_sockets[1].recv_nonblock(20)
             end
           rescue
-            # do nothing
+            #  do nothing
           end
         end
         if (ready == nil)
-          # proces the timeouts
+          #  proces the timeouts
           process_timeouts
           unused_loop_count+=1
         else
           process_ready(ready)
           unused_loop_count=0
-          #                  process_error(errors)
+          #                   process_error(errors)
         end
         @@mutex.synchronize{
           if (unused_loop_count > 10 && @@query_hash.empty? && @@observers.empty?)
@@ -215,22 +215,22 @@ module Dnsruby
             return
           end
         }
-        #              }
+        #               }
       end
     end
-    
+
     def process_error(errors)
       Dnsruby.log.debug{"Error! #{errors.inspect}"}
-      # @todo@ Process errors [can we do this in single socket environment?]
+      #  @todo@ Process errors [can we do this in single socket environment?]
     end
-    
-    #        @@query_hash[query_settings.client_query_id]=query_settings
-    #        @@socket_hash[query_settings.socket]=[query_settings.client_query_id] # @todo@ If we use persistent sockets then we need to update this array
+
+    #         @@query_hash[query_settings.client_query_id]=query_settings
+    #         @@socket_hash[query_settings.socket]=[query_settings.client_query_id] # @todo@ If we use persistent sockets then we need to update this array
     def process_ready(ready)
       ready.each do |socket|
         query_settings = nil
         @@mutex.synchronize{
-          # Can do this if we have a query per socket, but not otherwise...
+          #  Can do this if we have a query per socket, but not otherwise...
           c_q_id = @@socket_hash[socket][0] # @todo@ If we use persistent sockets then this won't work
           query_settings = @@query_hash[c_q_id]
         }
@@ -238,7 +238,7 @@ module Dnsruby
         udp_packet_size = query_settings.udp_packet_size
         msg, bytes = get_incoming_data(socket, udp_packet_size)
         if (msg!=nil)
-          # Check that the IP we received from was the IP we sent to!
+          #  Check that the IP we received from was the IP we sent to!
           answerip = msg.answerip.downcase
           answerfrom = msg.answerfrom.downcase
           dest_server = query_settings.dest_server
@@ -247,7 +247,7 @@ module Dnsruby
           begin
             destserveripaddr = IPAddr.new(dest_server)
           rescue ArgumentError
-            # Host name not IP address
+            #  Host name not IP address
           end
           if (dest_server && (dest_server != '0.0.0.0') &&
                 (answeripaddr != destserveripaddr) &&
@@ -260,22 +260,22 @@ module Dnsruby
         ready.delete(socket)
       end
     end
-    
+
     def send_response_to_client(msg, bytes, socket)
-      # Figure out which client_ids we were expecting on this socket, then see if any header ids match up
-      # @TODO@ Can get rid of this, as we only have one query per socket.
+      #  Figure out which client_ids we were expecting on this socket, then see if any header ids match up
+      #  @TODO@ Can get rid of this, as we only have one query per socket.
       client_ids=[]
       @@mutex.synchronize{
         client_ids = @@socket_hash[socket]
       }
-      # get the queries associated with them
+      #  get the queries associated with them
       client_ids.each do |id|
         query_header_id=nil
         @@mutex.synchronize{
           query_header_id = @@query_hash[id].query.header.id
         }
         if (query_header_id == msg.header.id)
-          # process the response
+          #  process the response
           client_queue = nil
           res = nil
           query=nil
@@ -285,7 +285,7 @@ module Dnsruby
             query = @@query_hash[id].query
           }
           tcp = (socket.class == TCPSocket)
-          # At this point, we should check if the response is OK
+          #  At this point, we should check if the response is OK
           if (ret = res.check_response(msg, bytes, query, client_queue, id, tcp))
             remove_id(id)
             exception = msg.get_exception
@@ -294,19 +294,19 @@ module Dnsruby
             end
             Dnsruby.log.debug{"Pushing response to client queue"}
             push_to_client(id, client_queue, msg, exception, query, res)
-            #            client_queue.push([id, msg, exception])
-            #            notify_queue_observers(client_queue, id)
+            #             client_queue.push([id, msg, exception])
+            #             notify_queue_observers(client_queue, id)
           else
-            # Sending query again - don't return response
+            #  Sending query again - don't return response
           end
           return
         end
       end
-      # If not, then we have an error
+      #  If not, then we have an error
       Dnsruby.log.error{"Stray packet - " + msg.inspect + "\n from " + socket.inspect}
       print("Stray packet - " + msg.question()[0].qname.to_s + " from " + msg.answerip.to_s + ", #{client_ids.length} client_ids\n")
     end
-    
+
     def remove_id(id)
       socket=nil
       @@mutex.synchronize{
@@ -322,7 +322,7 @@ module Dnsruby
       rescue IOError # Don't worry if the socket was closed already
       end
     end
-    
+
     def process_timeouts
       time_now = Time.now
       timeouts={}
@@ -335,11 +335,11 @@ module Dnsruby
         end
       end
     end
-    
+
     def tcp_read(socket)
-      # Keep buffer for all TCP sockets, and return
-      # to select after reading available data. Once all data has been received,
-      # then process message.
+      #  Keep buffer for all TCP sockets, and return
+      #  to select after reading available data. Once all data has been received,
+      #  then process message.
       buf=""
       expected_length = 0
       @@mutex.synchronize {
@@ -355,26 +355,26 @@ module Dnsruby
           input, = socket.recv_nonblock(expected_length-buf.length)
           if (input=="")
             TheLog.info("Bad response from server - no bytes read - ignoring")
-            # @TODO@ Should we do anything about this?
+            #  @TODO@ Should we do anything about this?
             return false
           end
           buf += input
         rescue
-          # Oh well - better luck next time!
+          #  Oh well - better luck next time!
           return false
         end
       end
-      # If data is complete, then return it.
+      #  If data is complete, then return it.
       if (buf.length == expected_length)
         if (expected_length == 2)
-          # We just read the data_length field. Now we need to start reading that many bytes.
+          #  We just read the data_length field. Now we need to start reading that many bytes.
           @@mutex.synchronize {
             answersize = buf.unpack('n')[0]
             @@tcp_buffers[socket] = ["", answersize]
           }
           return tcp_read(socket)
         else
-          # We just read the data - now return it
+          #  We just read the data - now return it
           @@mutex.synchronize {
             @@tcp_buffers.delete(socket)
           }
@@ -387,18 +387,18 @@ module Dnsruby
         return false
       end
     end
-    
+
     def get_incoming_data(socket, packet_size)
       answerfrom,answerip,answerport,answersize=nil
       ans,buf = nil
       begin
         if (socket.class == TCPSocket)
-          # @todo@ Ruby Bug #9061 stops this working right
-          # We'd like to do a socket.recvfrom, but that raises an Exception
-          # on Windows for TCPSocket for Ruby 1.8.5 (and 1.8.6).
-          # So, we need to do something different for TCP than UDP. *sigh*
-          # @TODO@ This workaround will only work if there is exactly one socket per query
-          #    - *not* ideal TCP use!
+          #  @todo@ Ruby Bug #9061 stops this working right
+          #  We'd like to do a socket.recvfrom, but that raises an Exception
+          #  on Windows for TCPSocket for Ruby 1.8.5 (and 1.8.6).
+          #  So, we need to do something different for TCP than UDP. *sigh*
+          #  @TODO@ This workaround will only work if there is exactly one socket per query
+          #     - *not* ideal TCP use!
           @@mutex.synchronize{
             client_id = @@socket_hash[socket][0]
             answerfrom = @@query_hash[client_id].dest_server
@@ -406,16 +406,16 @@ module Dnsruby
             answerport = @@query_hash[client_id].dest_port
           }
 
-          # Call TCP read here - that will take care of reading the 2 byte length,
-          # and then the full packet - without blocking select.
+          #  Call TCP read here - that will take care of reading the 2 byte length,
+          #  and then the full packet - without blocking select.
           buf = tcp_read(socket)
           if (!buf) # Wait for the buffer to comletely fill
-            #            handle_recvfrom_failure(socket, "")
+            #             handle_recvfrom_failure(socket, "")
             return
           end
         else
-          # @TODO@ Can we get recvfrom to stop issuing PTR queries when we already
-          # know both the FQDN and the IP address?
+          #  @TODO@ Can we get recvfrom to stop issuing PTR queries when we already
+          #  know both the FQDN and the IP address?
           if (ret = socket.recvfrom(packet_size))
             buf = ret[0]
             answerport=ret[1][1]
@@ -423,7 +423,7 @@ module Dnsruby
             answerip=ret[1][3]
             answersize=(buf.length)
           else
-            # recvfrom failed - why?
+            #  recvfrom failed - why?
             Dnsruby.log.error{"Error - recvfrom failed from #{socket}"}
             handle_recvfrom_failure(socket, "")
             return
@@ -435,7 +435,7 @@ module Dnsruby
         return
       end
       Dnsruby.log.debug{";; answer from #{answerfrom} : #{answersize} bytes\n"}
-      
+
       begin
         ans = Message.decode(buf)
       rescue Exception => e
@@ -444,19 +444,19 @@ module Dnsruby
         if (client_id == nil)
           Dnsruby.log.error{"Decode error from #{answerip} but can't determine packet id"}
         end
-        # We should check if the TC bit is set (if we can get that far)
+        #  We should check if the TC bit is set (if we can get that far)
         if ((DecodeError === e) && (e.partial_message.header.tc))
           Dnsruby.log.error{"Decode error (from {answerip})! Header shows truncation, so trying again over TCP"}
-          # If it is, then we should retry over TCP
+          #  If it is, then we should retry over TCP
           sent = false
           @@mutex.synchronize{
             client_ids = @@socket_hash[socket]
-            # get the queries associated with them
+            #  get the queries associated with them
             client_ids.each do |id|
               query_header_id=nil
               query_header_id = @@query_hash[id].query.header.id
               if (query_header_id == e.partial_message.header.id)
-                # process the response
+                #  process the response
                 client_queue = nil
                 res = nil
                 query=nil
@@ -464,7 +464,7 @@ module Dnsruby
                 res = @@query_hash[id].single_resolver
                 query = @@query_hash[id].query
 
-                # NOW RESEND OVER TCP!
+                #  NOW RESEND OVER TCP!
                 Thread.new {
                   res.send_async(query, client_queue, id, true)
                 }
@@ -481,7 +481,7 @@ module Dnsruby
         end
         return
       end
-      
+
       if (ans!= nil)
         Dnsruby.log.debug{"#{ans}"}
         ans.answerfrom=(answerfrom)
@@ -490,10 +490,10 @@ module Dnsruby
       end
       return ans, buf
     end
-    
+
     def handle_recvfrom_failure(socket, exception)
-      #  No way to notify the client about this error, unless there was only one connection on the socket
-      # Not a problem, as there only will ever be one connection on the socket (Kaminsky attack mitigation)
+      #   No way to notify the client about this error, unless there was only one connection on the socket
+      #  Not a problem, as there only will ever be one connection on the socket (Kaminsky attack mitigation)
       ids_for_socket = []
       @@mutex.synchronize{
         ids_for_socket = @@socket_hash[socket]
@@ -509,18 +509,18 @@ module Dnsruby
         Dnsruby.log.fatal{"Recvfrom failed from #{socket}, no way to tell query id"}
       end
     end
-    
+
     def get_client_id_from_answerfrom(socket, answerip, answerport)
-      # @TODO@ Can get rid of this, as there is only one query per socket
+      #  @TODO@ Can get rid of this, as there is only one query per socket
       client_id=nil
-      # Figure out client id from answerfrom
+      #  Figure out client id from answerfrom
       @@mutex.synchronize{
         ids = @@socket_hash[socket]
         ids.each do |id|
-          # Does this id speak to this dest_server?
+          #  Does this id speak to this dest_server?
           query_settings = @@query_hash[id]
           if (answerip == query_settings.dest_server && answerport == query_settings.dest_port)
-            # We have a match
+            #  We have a match
             client_id = id
             break
           end
@@ -528,24 +528,24 @@ module Dnsruby
       }
       return client_id
     end
-    
+
     def send_exception_to_client(err, socket, client_id, msg=nil)
-      # find the client response queue
+      #  find the client response queue
       client_queue = nil
       @@mutex.synchronize {
         client_queue = @@query_hash[client_id].client_queue
       }
       remove_id(client_id)
-      #      push_to_client(client_id, client_queue, msg, err)
+      #       push_to_client(client_id, client_queue, msg, err)
       client_queue.push([client_id, Resolver::EventType::ERROR, msg, err])
       notify_queue_observers(client_queue, client_id)
     end
-    
+
     def push_exception_to_select(client_id, client_queue, err, msg)
       @@mutex.synchronize{
         @@queued_exceptions.push([client_id, client_queue, err, msg])
       }
-      # Make sure select loop is running!
+      #  Make sure select loop is running!
       if (@@select_thread && @@select_thread.alive?)
       else
         @@select_thread = Thread.new {
@@ -553,10 +553,10 @@ module Dnsruby
         }
       end
     end
-    
+
     def push_response_to_select(client_id, client_queue, msg, query, res)
-      # This needs to queue the response TO THE SELECT THREAD, which then needs
-      # to send it out from its normal loop.
+      #  This needs to queue the response TO THE SELECT THREAD, which then needs
+      #  to send it out from its normal loop.
       Dnsruby.log.debug{"Pushing response to client queue direct from resolver or validator"}
       @@mutex.synchronize{
         err = nil
@@ -565,7 +565,7 @@ module Dnsruby
         end
         @@queued_responses.push([client_id, client_queue, msg, err, query, res])
       }
-      # Make sure select loop is running!
+      #  Make sure select loop is running!
       if (@@select_thread && @@select_thread.alive?)
       else
         @@select_thread = Thread.new {
@@ -573,15 +573,15 @@ module Dnsruby
         }
       end
     end
-    
+
     def push_validation_response_to_select(client_id, client_queue, msg, err, query, res)
-      # This needs to queue the response TO THE SELECT THREAD, which then needs
-      # to send it out from its normal loop.
+      #  This needs to queue the response TO THE SELECT THREAD, which then needs
+      #  to send it out from its normal loop.
       Dnsruby.log.debug{"Pushing response to client queue direct from resolver or validator"}
       @@mutex.synchronize{
         @@queued_validation_responses.push([client_id, client_queue, msg, err, query, res])
       }
-      # Make sure select loop is running!
+      #  Make sure select loop is running!
       if (@@select_thread && @@select_thread.alive?)
       else
         @@select_thread = Thread.new {
@@ -596,15 +596,15 @@ module Dnsruby
         exceptions = @@queued_exceptions
         @@queued_exceptions = []
       }
-      
+
       exceptions.each do |item|
         client_id, client_queue, err, msg = item
-        #        push_to_client(client_id, client_queue, msg, err)
+        #         push_to_client(client_id, client_queue, msg, err)
         client_queue.push([client_id, Resolver::EventType::ERROR, msg, err])
         notify_queue_observers(client_queue, client_id)
       end
     end
-    
+
     def send_queued_responses
       responses = []
       @@mutex.synchronize{
@@ -614,13 +614,13 @@ module Dnsruby
 
       responses.each do |item|
         client_id, client_queue, msg, err, query, res = item
-        #        push_to_client(client_id, client_queue, msg, err)
+        #         push_to_client(client_id, client_queue, msg, err)
         client_queue.push([client_id, Resolver::EventType::RECEIVED, msg, err])
         notify_queue_observers(client_queue, client_id)
-        # Do we need to validate this? The response has come from the cache -
-        # validate it only if it has not been validated already
-        # So, if we need to validate it, send it to the validation thread
-        # Otherwise, send VALIDATED to the requester.
+        #  Do we need to validate this? The response has come from the cache -
+        #  validate it only if it has not been validated already
+        #  So, if we need to validate it, send it to the validation thread
+        #  Otherwise, send VALIDATED to the requester.
         if (((msg.security_level == Message::SecurityLevel::UNCHECKED) ||
                 (msg.security_level == Message::SecurityLevel::INDETERMINATE)) &&
               (ValidatorThread.requires_validation?(query, msg, err, res)))
@@ -643,28 +643,28 @@ module Dnsruby
 
       responses.each do |item|
         client_id, client_queue, msg, err, query, res = item
-        #        push_to_client(client_id, client_queue, msg, err)
+        #         push_to_client(client_id, client_queue, msg, err)
         client_queue.push([client_id, Resolver::EventType::VALIDATED, msg, err])
         notify_queue_observers(client_queue, client_id)
       end
     end
 
     def push_to_client(client_id, client_queue, msg, err, query, res)
-      # @TODO@ Really need to let the client know that we have received a valid response!
-      # Can do that by calling notify_observers here, but with an identifier which
-      # defines the response to be a "Response received - validating. Please stop sending"
-      # type of response.
+      #  @TODO@ Really need to let the client know that we have received a valid response!
+      #  Can do that by calling notify_observers here, but with an identifier which
+      #  defines the response to be a "Response received - validating. Please stop sending"
+      #  type of response.
       client_queue.push([client_id, Resolver::EventType::RECEIVED, msg, err])
       notify_queue_observers(client_queue, client_id)
 
       if (!err || (err.instance_of?(NXDomain)))
-        #
-        # This method now needs to push the response to the validator,
-        # which will then take responsibility for delivering it to the client.
-        # The validator will need access to the queue observers -
+        # 
+        #  This method now needs to push the response to the validator,
+        #  which will then take responsibility for delivering it to the client.
+        #  The validator will need access to the queue observers -
         validator = ValidatorThread.new(client_id, client_queue, msg, err, query ,self, res)
         validator.run
-        #      @@validator.add_to_queue([client_id, client_queue, msg, err, query, self, res])
+        #       @@validator.add_to_queue([client_id, client_queue, msg, err, query, self, res])
       end
     end
 
@@ -677,11 +677,11 @@ module Dnsruby
         end
       }
     end
-    
+
     def remove_observer(client_queue, observer)
       @@mutex.synchronize {
         if (@@observers[client_queue]==observer)
-          #          @@observers.delete(observer)
+          #           @@observers.delete(observer)
           @@observers.delete(client_queue)
         else
           if (@@observers[client_queue] == nil)
@@ -696,7 +696,7 @@ module Dnsruby
     end
 
     def notify_queue_observers(client_queue, client_query_id)
-      # If any observers are known for this query queue then notify them
+      #  If any observers are known for this query queue then notify them
       observer=nil
       @@mutex.synchronize {
         observer = @@observers[client_queue]
@@ -705,9 +705,9 @@ module Dnsruby
         observer.handle_queue_event(client_queue, client_query_id)
       end
     end
-    
+
     def send_tick_to_observers
-      # If any observers are known then send them a tick
+      #  If any observers are known then send them a tick
       tick_observers=nil
       @@mutex.synchronize {
         tick_observers = @@tick_observers