dnstraverse 0.0.1 → 0.1.0

data/Rakefile

@@ -1,19 +1,62 @@
-require 'rake/gempackagetask'
-spec = Gem::Specification.new do |s|
-  s.name = 'dnstraverse'
-  s.summary = 'Complete DNS traversal checker'
-  s.description = File.read(File.join(File.dirname(__FILE__), 'README'))
-  s.requirements = []
-  s.version = '0.0.1'
-  s.author = 'James Ponder'
-  s.email = 'james@squish.net'
-  s.homepage = 'http://www.squish.net/dnstraverse/'
-  s.platform = Gem::Platform::RUBY
-  s.required_ruby_version = '>=1.8'
-  s.files = Dir['**/**']
-  s.executables = [ 'dnstraverse' ]
-  s.test_files = Dir["test/test*.rb"]
-  s.has_rdoc = true
-  s.add_dependency('dnsruby', '>= 1.26')
+# encoding: utf-8
+
+require 'lib/dnstraverse/version'
+
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = 'dnstraverse'
+  gem.summary = 'Complete DNS traversal checker'
+  gem.description = File.read(File.join(File.dirname(__FILE__), 'README'))
+  gem.homepage = 'http://www.squish.net/dnstraverse/'
+  gem.license = "GPL"
+  gem.email = 'james@squish.net'
+  gem.authors = ['James Ponder']
+  gem.required_ruby_version = '>=1.8'
+  gem.version = DNSTraverse::Version::STRING;
+  gem.files = FileList["Rakefile", "{bin,generators,lib,test}/**/*"]
+  gem.extra_rdoc_files = ['README', 'LICENSE']
+  gem.executables = [ 'dnstraverse' ]
+  gem.has_rdoc = true
+#  gem.test_files = Dir["test/test*.rb"]
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+#require 'rcov/rcovtask'
+#Rcov::RcovTask.new do |test|
+#  test.libs << 'test'
+#  test.pattern = 'test/**/test_*.rb'
+#  test.verbose = true
+#  test.rcov_opts << '--exclude "gems/*"'
+#end
+
+task :default => :test
+
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "dnstraverse #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
-Rake::GemPackageTask.new(spec).define

data/bin/dnstraverse

@@ -6,34 +6,6 @@
 #
 # = Usage
 # dnstraverse [options] DOMAIN
-#    -t, --type TYPE              Select record type (A, AAAA, SRV, WKS, NS,
-#                                   CNAME, SOA, PTR, HINFO, MINFO, MX, TXT, ANY)
-#        --root-server HOST       Root DNS server (default - ask local resolver)
-#        --[no-]all-root-servers  Find all root servers (default false)
-#        --root-aaaa              TODO Look for IPv6 addresses for root servers
-#        --follow-aaaa            TODO Only follow AAAA records for referrals
-#        --udp-size SIZE          Turn on EDNS0 with given UDP size
-#        --max-depth DEPTH        Maximum depth to traverse (default 10)
-#        --retries TIMES          Number of 2s retries before timing out (2)
-#        --[no-]allow-tcp         Try using tcp if udp truncated (default true)
-#        --[no-]always-tcp        Always use tcp (default false)
-#
-#        --[no-]show-progress     Display progress information (default true)
-#        --[no-]show-all-stats    Display statistics as we go (default false)
-#        --[no-]show-resolves     Display referral resolutions (default false)
-#        --[no-]show-serverlist   Display list of servers seen (default true)
-#        --[no-]show-versions     Display versions of dns servers (default true)
-#        --[no-]show-results      Display the results (default true)
-#
-#        --fast                   Short-cut answers using previous information,
-#                                 less accurate but usually ok - by-passes the
-#                                 proper simulation of the resolver cache.
-#
-#    -v, --[no-]verbose           Run verbosely
-#    -d, --debug                  Debug mode: One -d for DNSCheck debug
-#                                             Two -d also turns on library debug
-#    -h, --help                   Show full help
-#    -V, --version                Show version and exit
 #
 # == Example
 #   dnstraverse www.nic.uk
@@ -56,8 +28,7 @@ require 'pp'
 require 'dnstraverse/traverser'
 require 'dnstraverse/log'
 require 'dnstraverse/fingerprint'
-
-Version = [ 0, 0, 1].freeze
+require 'dnstraverse/version'
 
 EMPTY_STRING = ''.freeze
 
@@ -136,7 +107,7 @@ options[:broken] = false
 options[:progress] = true
 options[:summary] = true
 options[:resolves] = false
-options[:serverlist] = true
+options[:servers] = false
 options[:versions] = true
 options[:domainname] = nil
 options[:follow_aaaa] = false
@@ -145,36 +116,37 @@ options[:always_tcp] = false
 options[:allow_tcp] = false
 options[:allstats] = false
 options[:saveobjects] = false
-options[:fast] = false
-options[:udpsize] = 512
-options[:maxdepth] = 10
+options[:fast] = true
+options[:udpsize] = 2048
+options[:maxdepth] = 24
 options[:retries] = 2
 options[:results] = true
 
 opts = OptionParser.new
 opts.banner = "Usage: #{File.basename($0)} [options] DOMAIN"  
-opts.on("-v", "--[no-]verbose") { |o| options[:verbose] = o }
-opts.on("-d", "--[no-]debug") { |o| options[:debug]+= 1 }
-opts.on("-r", "--root-server HOST") { |o| options[:root] = o }
-opts.on("-a", "--all-root-servers") { |o| options[:allroots] = o }
-opts.on("-t", "--type TYPE", Dnsruby::Types.constants) { |o| options[:type] = o }
-opts.on("--udp-size SIZE") { |o| options[:udpsize] = o }
-opts.on("--allow-tcp") { |o| options[:allow_tcp] = o }
-opts.on("--always-tcp") { |o| options[:always_tcp] = o }
-opts.on("--max-depth DEPTH") { |o| options[:maxdepth] = o }
-opts.on("--retries TIMES") { |o| options[:retries] = o }
-opts.on("--[no-]follow-aaaa") { |o| options[:follow_aaaa] = o }
-opts.on("--[no-]root-aaaa") { |o| options[:root_aaaa] = o }
-opts.on("--[no-]show-progress") { |o| options[:progress] = o }
-opts.on("--[no-]show-resolves") { |o| options[:resolves] = o }
-opts.on("--[no-]show-serverlist") { |o| options[:serverlist] = o }
-opts.on("--[no-]show-versions") { |o| options[:versions] = o }
-opts.on("--[no-]show-all-stats") { |o| options[:allstats] = o }
-opts.on("--[no-]show-results") { |o| options[:results] = o }
+opts.on("-v", "--[no-]verbose", "Run verbosely") { |o| options[:verbose] = o }
+opts.on("-d", "--[no-]debug", "Debug mode.  Use twice to turn on library debug.") { |o| options[:debug]+= 1 }
+opts.on("-r", "--root-server HOST", "Root DNS server (default - ask local resolver)") { |o| options[:root] = o }
+opts.on("-a", "--all-root-servers", "Find all root servers (default false)") { |o| options[:allroots] = o }
+opts.on("-t", "--type TYPE", Dnsruby::Types.constants,
+        "Record type (A, AAAA, SRV, WKS, NS, CNAME, SOA, PTR, HINFO, MINFO, MX, TXT, ANY") { |o| options[:type] = o }
+opts.on("--udp-size SIZE", "UDP packet size (default 2048).  Set to 512 to turn off EDNS0.") { |o| options[:udpsize] = o }
+opts.on("--allow-tcp", "Try using tcp if udp truncated (default true)") { |o| options[:allow_tcp] = o }
+opts.on("--always-tcp", "Always use tcp (default false)") { |o| options[:always_tcp] = o }
+opts.on("--max-depth DEPTH", "Maximum traversal depth (default 24)") { |o| options[:maxdepth] = o }
+opts.on("--retries TIMES", "Number of 2s retries before timing out (default 2)") { |o| options[:retries] = o }
+opts.on("--[no-]follow-aaaa", "Only follow AAAA records for referrals (default false)") { |o| options[:follow_aaaa] = o }
+opts.on("--[no-]root-aaaa", "Look for IPv6 addresses for root servers (default false)") { |o| options[:root_aaaa] = o }
+opts.on("--[no-]show-progress", "Display progress information (default true)") { |o| options[:progress] = o }
+opts.on("--[no-]show-resolves", "Display referral resolutions (default false)") { |o| options[:resolves] = o }
+opts.on("--[no-]show-servers", "Display list of servers seen (default false)") { |o| options[:servers] = o }
+opts.on("--[no-]show-versions", "Display versions of dns servers (default true)") { |o| options[:versions] = o }
+opts.on("--[no-]show-all-stats", "Display statistics as we go (default false)") { |o| options[:allstats] = o }
+opts.on("--[no-]show-results", "Display the results (default true)") { |o| options[:results] = o }
 opts.on("--save-objects") { |o| options[:saveobjects] = o }
-opts.on("--fast") { |o| options[:fast] = o }
-opts.on_tail("-h", "--help") { RDoc::usage }
-opts.on_tail("-V", "--version") { puts Version.join('.'); exit }
+opts.on("--[no-]fast", "Fast mode (default true) turn off to be more accurate" ) { |o| options[:fast] = o }
+opts.on_tail("-h", "--help", "Show full help") { puts opts; exit }
+opts.on_tail("-V", "--version", "Show version") { puts DNSTraverse::Version::STRING; exit }
 begin
   opts.parse!
   if ARGV.size != 1 then
@@ -183,7 +155,8 @@ begin
   options[:domainname] = ARGV.shift
 rescue OptionParser::ParseError => e
   puts e
-  RDoc::usage(1, 'Usage')
+  puts opts
+  exit
 end
 Log.level = options[:debug] > 0 ? Logger::DEBUG : Logger::UNKNOWN
 Log.debug {"Options chosen:\n" }
@@ -232,7 +205,7 @@ begin
                                :maxdepth => options[:maxdepth],
                                :retries => options[:retries])
   puts if options[:progress]
-  if options[:serverlist] then
+  if options[:servers] then
     puts "The following servers were encountered:"
     fp = options[:versions] ? DNSTraverse::Fingerprint.new : nil
     seen = traverser.servers_encountered

data/lib/dnstraverse/caching_resolver.rb

@@ -34,7 +34,6 @@ module DNSTraverse
       @requests+= 1
       ip = self.config.nameserver[0]
       udp_size = self.udp_size
-      self.udp_size = udp_size # workaround for bug in dnsruby
       Log.debug { "Querying #{name} to #{ip} class #{klass} type #{type}"}
       key = "key:res:#{ip}:#{name}:#{klass}:#{type}:#{udp_size}"
       if @cache.has_key?(key) then
@@ -46,9 +45,8 @@ module DNSTraverse
       begin
         msg = Dnsruby::Message.new
         msg.add_question(name, type, klass)
-        q = Queue.new
-        send_async(msg, q)
-        id, result, error = q.pop
+        msg.add_additional(Dnsruby::RR::OPT.new(udp_size)) if udp_size > 512
+        result, error = send_plain_message(msg)
         answer = result || error
       rescue => e
         answer = RuntimeError.new "Dnsruby failure: " + e.to_s

data/lib/dnstraverse/decoded_query.rb

@@ -30,6 +30,7 @@ module DNSTraverse
     attr_reader :auth_ns, :auth_soa, :auth_other # authority info
     attr_reader :exception_message, :error_message # :exception/:error only
     attr_reader :answers # :answered only
+    attr_reader :warnings # warnings about this query
     attr_reader :authoritynames # auth_ns converted to array of strings
     #    attr_reader :stats_key
     

data/lib/dnstraverse/fingerprint.rb

@@ -152,9 +152,7 @@ module DNSTraverse
       msg = Dnsruby::Message.new
       msg.header = fp2header(headerstr)
       msg.add_question(decode_query(query))
-      q = Queue.new
-      @resolver.send_async(msg, q)
-      id, result, error = q.pop
+      result, error = @resolver.send_plain_message(msg)
       ans = result || error
       return nil, FINGERPRINT_TIMEOUT if ans.is_a? Dnsruby::ResolvTimeout
       return nil, ans.to_s if ans.is_a? Exception

data/lib/dnstraverse/fingerprint_rules.rb

@@ -39,7 +39,7 @@ module FingerprintRules
     "0,QUERY,0,0,0,0,0,1,NOERROR,0,0,0,0",
   ].freeze
   
-  INITRULE = { :header => QY[0], :query => ". IN A" }.freeze
+  INITRULE = { :header => QY[2], :query => ". IN MAILB" }.freeze
   
   IQ = [ "1,IQUERY,0,0,1,0,0,0,FORMERR,0,0,0,0",   # iq0
     "1,IQUERY,0,0,1,0,0,0,FORMERR,1,0,0,0",   # iq1
@@ -121,7 +121,7 @@ module FingerprintRules
     "1,QUERY,0,0,1,1,0,0,FORMERR,1,0,0,0",
     "1,QUERY,0,0,0,1,0,0,SERVFAIL,1,0,0,0",
     "1,QUERY,0,0,1,1,0,0,NOERROR,1,1,0,0",
-    "1,IQUERY,1,0,1,0,0,0,NOERROR,1,0,0,0", #iq80
+    "1,IQUERY,1,0,1,0,0,0,NOERROR,1,0,1,0", #iq80
     "1,IQUERY,1,0,1,1,0,0,NOTIMP,1,0,0,0",
     "1,QUERY,0,0,1,1,0,0,NOERROR,1,0,0,0",
     "1,QUERY,1,0,1,1,0,0,NOERROR,1,1,1,.+",
@@ -130,260 +130,285 @@ module FingerprintRules
     "1,QUERY,1,0,0,1,0,0,NXDOMAIN,1,0,0,0",
     "1,QUERY,0,0,0,1,0,0,NOTIMP,0,0,0,0",
     "1,QUERY,0,0,0,0,0,0,REFUSED,1,0,0,0",
-    "1,QUERY,1,0,1,1,0,0,NXDOMAIN,1,0,0,0",
+    "1,QUERY,1,0,1,1,0,0,NXDOMAIN,1,0,0,0", #iq89
     "1,QUERY,1,0,0,0,0,0,NOERROR,1,1,0,0", #iq90
     "1,IQUERY,1,0,1,1,0,1,NOTIMP,1,0,0,0",
     "1,QUERY,0,0,0,1,0,0,NOTIMP,1,0,0,0",
     "1,QUERY,0,0,1,0,0,1,SERVFAIL,1,0,0,0",
+    "1,QUERY,0,0,0,1,0,0,NOERROR,1,0,13,13", #iq94
+    "1,QUERY,0,0,0,1,0,0,NOERROR,1,0,1,0", #iq95
+    "1,QUERY,0,0,1,0,0,0,NOERROR,1,0,13,13",
+    "1,IQUERY,1,0,0,0,0,0,NOTIMP,1,0,0,0", #iq97
+    "1,IQUERY,1,0,0,0,1,1,NOTIMP,1,0,0,0", #iq98
+    "1,IQUERY,0,0,1,1,0,0,NOERROR,1,0,1,0", #iq99
+    "1,QUERY,.,0,1,0,0,0,NOERROR,1,0,0,0", #iq100
+    "1,QUERY,0,0,1,0,0,0,NXDOMAIN,1,0,0,0", #101
   ].freeze
   
   RULESET = [
-  { :fingerprint => "query timed out" , :header => QY[0],  :query => "com. IN A", :ruleset => [
-    { :fingerprint => "query timed out", :header => QY[7], :query => ". CH A", :ruleset => [
-      { :fingerprint => "query timed out", :header => QY[6], :query => ". IN A", :ruleset => [
-        { :fingerprint => IQ[38], :result => { :vendor => "Digital Lumber", :product => "Oak DNS", :version =>"" },  :qv => ":version.oak",}, 
-##        { :fingerprint => "query timed out", :result => "TIMEOUT",}, 
-        { :fingerprint => ".+", :state => "q0tq0tq7tq6r?", }, ]
+  { :fingerprint => IQ[89], :result => { :vendor => "Simon Kelley", :product => "dnsmasq", :version =>""}, :qv => "version.bind", },
+  { :fingerprint => ".+", :header => QY[0], :query => ". IN A", :ruleset => [
+    { :fingerprint => "query timed out" , :header => QY[0],  :query => "com. IN A", :ruleset => [
+      { :fingerprint => "query timed out", :header => QY[7], :query => ". CH A", :ruleset => [
+        { :fingerprint => "query timed out", :header => QY[6], :query => ". IN A", :ruleset => [
+          { :fingerprint => IQ[38], :result => { :vendor => "Digital Lumber", :product => "Oak DNS", :version =>"" },  :qv => ":version.oak",}, 
+          { :fingerprint => "query timed out", :result => "TIMEOUT",}, 
+          { :fingerprint => ".+", :state => "q0tq0tq7tq6r?", }, ]
+        },
+        { :fingerprint => IQ[35], :result => { :vendor => "XBILL", :product => "jnamed (dnsjava)", :version => "" }, },
+        { :fingerprint => IQ[36], :result => { :vendor => "Men & Mice", :product => "QuickDNS for MacOS Classic", :version => ""}, }, 
+        { :fingerprint => IQ[37], :result => { :vendor => "unknown", :product => "NonSequitur DNS", :version => ""}, },
+        { :fingerprint => ".+", :state => "q0tq0tq7r?", }, ]  
       },
-      { :fingerprint => IQ[35], :result => { :vendor => "XBILL", :product => "jnamed (dnsjava)", :version => "" }, },
-      { :fingerprint => IQ[36], :result => { :vendor => "menandmice", :product => "QuickDNS", :version => ""}, }, 
-      { :fingerprint => IQ[37], :result => { :vendor => "unknown", :product => "NonSequitur DNS", :version => ""}, },
-      { :fingerprint => ".+", :state => "q0tq0tq7r?", }, ]  
+      { :fingerprint => IQ[35], :result => { :vendor => "eNom", :product => "eNom DNS", :version =>""}, },
+      { :fingerprint => ".+", :state => "q0tq0r?", },]
     },
-    { :fingerprint => IQ[35], :result => { :vendor => "eNom", :product => "eNom DNS", :version =>""}, },
-    { :fingerprint => ".+", :state => "q0tq0r?", },]
-  },
   
-  { :fingerprint => IQ[0], :header => QY[1], :query=> "jjjjjjjjjjjj IN A", :ruleset => [
-    { :fingerprint => IQ[12], :result => { :vendor => "ISC", :product => "BIND", :version => "8.4.1-p1" },  :qv => ":version.bind",},                         
-    { :fingerprint => IQ[13], :result => { :vendor => "ISC", :product => "BIND", :version => "8 plus root server modifications"},  :qv => ":version.bind",}, 
-    { :fingerprint => IQ[15], :result => { :vendor => "Cisco", :product => "CNR", :version => ""}, },
-    { :fingerprint => IQ[16], :header => QY[2], :query => "hostname.bind CH TXT", :ruleset => [
-      { :fingerprint => IQ[58], :result => { :vendor => "ISC", :product => "BIND", :version => "8.3.0-RC1 -- 8.4.4"},  :qv => ":version.bind",},     
-      { :fingerprint => IQ[50], :result => { :vendor => "ISC", :product => "BIND", :version => "8.3.0-RC1 -- 8.4.4"},  :qv => ":version.bind",},    
-      { :fingerprint => IQ[48], :result => { :vendor => "ISC", :product => "BIND", :version => "8.2.2-P3 -- 8.3.0-T2A"},  :qv => ":version.bind",},
-      { :fingerprint => ".+", :state => "q0r0q1r16q2r?", },]
+    { :fingerprint => IQ[0], :header => QY[1], :query=> "jjjjjjjjjjjj IN A", :ruleset => [
+      { :fingerprint => IQ[12], :result => { :vendor => "ISC", :product => "BIND", :version => "8.4.1-p1" },  :qv => ":version.bind",},                         
+      { :fingerprint => IQ[13], :result => { :vendor => "ISC", :product => "BIND", :version => "8 plus root server modifications"},  :qv => ":version.bind",}, 
+      { :fingerprint => IQ[15], :result => { :vendor => "Cisco", :product => "CNR", :version => ""}, },
+      { :fingerprint => IQ[16], :header => QY[2], :query => "hostname.bind CH TXT", :ruleset => [
+        { :fingerprint => IQ[58], :result => { :vendor => "ISC", :product => "BIND", :version => "8.3.0-RC1 -- 8.4.4"},  :qv => ":version.bind",},     
+        { :fingerprint => IQ[50], :result => { :vendor => "ISC", :product => "BIND", :version => "8.3.0-RC1 -- 8.4.4"},  :qv => ":version.bind",},    
+        { :fingerprint => IQ[48], :result => { :vendor => "ISC", :product => "BIND", :version => "8.2.2-P3 -- 8.3.0-T2A"},  :qv => ":version.bind",},
+        { :fingerprint => ".+", :state => "q0r0q1r16q2r?", },]
+      },
+      { :fingerprint => ".+", :state => "q0r0q1r?", },]
     },
-    { :fingerprint => ".+", :state => "q0r0q1r?", },]
-  },
-  
-  { :fingerprint => IQ[1], :header => QY[2], :query => ". IN IXFR", :ruleset => [
-    { :fingerprint => IQ[31], :result => { :vendor => "Microsoft", :product => "Windows DNS", :version => "2000" }, },        
-    { :fingerprint => IQ[32], :result => { :vendor => "Microsoft", :product => "Windows DNS", :version => "NT4" }, },
-    { :fingerprint => IQ[50], :result => { :vendor => "Microsoft", :product => "Windows DNS", :version => "2003"}, },
-    { :fingerprint => ".+", :state => "q0r1q2r?", }, ]
-  },
-  
-  { :fingerprint => IQ[2], :header => QY[1], :ruleset => [
-    { :fingerprint => IQ[11], :result => { :vendor => "ISC", :product => "BIND", :version => "9.2.3rc1 -- 9.4.0a0" }, :qv => ":version.bind",},    
-    { :fingerprint => IQ[12], :header => QY[3], :ruleset => [
-      { :fingerprint => IQ[25], :header => QY[6], :ruleset => [
-        { :fingerprint => IQ[33], :result => { :vendor => "bboy", :product => "MyDNS", :version => "" },},        
-        { :fingerprint => IQ[34], :header => QY[2],  :query  => "012345678901234567890123456789012345678901234567890123456789012.012345678901234567890123456789012345678901234567890123456789012.012345678901234567890123456789012345678901234567890123456789012.0123456789012345678901234567890123456789012345678901234567890. IN A", :ruleset => [
-          { :fingerprint => IQ[47], :result => { :vendor => "NLnetLabs", :product => "NSD", :version => "1.0.3 -- 1.2.1"}, :qv => ":version.server", }, 
-          { :fingerprint => IQ[48], :header => QY[2],  :query  => "hostname.bind CH TXT", :ruleset => [
-            { :fingerprint => IQ[50], :result => { :vendor => "NLnetLabs", :product => "NSD", :version => "1.2.2" }, :qv => ":version.server", },
-            { :fingerprint => IQ[51], :header => QY[8], :query => ". IN A", :ruleset => [
-              { :fingerprint => IQ[93], :result => { :vendor => "NLnetLabs", :product => "NSD", :version => "1.2.3 -- 2.1.2" } , :qv => ":version.server",  },
-              { :fingerprint => IQ[48], :result => { :vendor => "NLnetLabs", :product => "NSD", :version => "2.1.3" }, :qv => ":version.server",  }, 
-              { :fingerprint => ".+", :state => "q0r2q1r12q3r25q6r34q2r48q2r51q8r?", }, ]
+    
+    { :fingerprint => IQ[1], :header => QY[2], :query => ". IN IXFR", :ruleset => [
+      { :fingerprint => IQ[31], :result => { :vendor => "Microsoft", :product => "Windows DNS", :version => "2000" }, },        
+      { :fingerprint => IQ[32], :result => { :vendor => "Microsoft", :product => "Windows DNS", :version => "NT4" }, },
+      { :fingerprint => IQ[50], :result => { :vendor => "Microsoft", :product => "Windows DNS", :version => "2003"}, },
+      { :fingerprint => ".+", :state => "q0r1q2r?", }, ]
+    },
+    
+    { :fingerprint => IQ[2], :header => QY[1], :ruleset => [
+      { :fingerprint => IQ[11], :result => { :vendor => "ISC", :product => "BIND", :version => "9.2.3rc1 -- 9.4.0a4" }, :qv => ":version.bind",},    
+      { :fingerprint => IQ[12], :header => QY[3], :ruleset => [
+        { :fingerprint => IQ[25], :header => QY[6], :ruleset => [
+          { :fingerprint => IQ[33], :result => { :vendor => "bboy", :product => "MyDNS", :version => "" },},        
+          { :fingerprint => IQ[34], :header => QY[2],  :query  => "012345678901234567890123456789012345678901234567890123456789012.012345678901234567890123456789012345678901234567890123456789012.012345678901234567890123456789012345678901234567890123456789012.0123456789012345678901234567890123456789012345678901234567890. IN A", :ruleset => [
+            { :fingerprint => IQ[47], :result => { :vendor => "NLnetLabs", :product => "NSD", :version => "1.0.3 -- 1.2.1"}, :qv => ":version.server", }, 
+            { :fingerprint => IQ[48], :header => QY[2],  :query  => "hostname.bind CH TXT", :ruleset => [
+              { :fingerprint => IQ[50], :result => { :vendor => "NLnetLabs", :product => "NSD", :version => "1.2.2" }, :qv => ":version.server", },
+              { :fingerprint => IQ[51], :header => QY[8], :query => ". IN A", :ruleset => [
+                { :fingerprint => IQ[93], :result => { :vendor => "NLnetLabs", :product => "NSD", :version => "1.2.3 -- 2.1.2" } , :qv => ":version.server",  },
+                { :fingerprint => IQ[48], :result => { :vendor => "NLnetLabs", :product => "NSD", :version => "2.1.3" }, :qv => ":version.server",  }, 
+                { :fingerprint => ".+", :state => "q0r2q1r12q3r25q6r34q2r48q2r51q8r?", }, ]
+              },
+              { :fingerprint => ".+", :state => "q0r2q1r12q3r25q6r34q2r48q2r?", }, ]
             },
-            { :fingerprint => ".+", :state => "q0r2q1r12q3r25q6r34q2r48q2r?", }, ]
-          },
-          { :fingerprint => IQ[49], :header => QY[2],  :query  => "hostname.bind CH TXT", :ruleset => [
-            { :fingerprint => IQ[50], :result => { :vendor => "NLnetLabs", :product => "NSD", :version => "1.2.2 [root]"} , :qv => ":version.server",  },
-            { :fingerprint => IQ[51], :result => { :vendor => "NLnetLabs", :product => "NSD", :version => "1.2.3 [root]"}, :qv => ":version.server", }, 
-            { :fingerprint => ".+", :state => "q0r2q1r12q3r25q6r34q2r49q2r?", }, ]
+            { :fingerprint => IQ[49], :header => QY[2],  :query  => "hostname.bind CH TXT", :ruleset => [
+              { :fingerprint => IQ[50], :result => { :vendor => "NLnetLabs", :product => "NSD", :version => "1.2.2 [root]"} , :qv => ":version.server",  },
+              { :fingerprint => IQ[51], :result => { :vendor => "NLnetLabs", :product => "NSD", :version => "1.2.3 [root]"}, :qv => ":version.server", }, 
+              { :fingerprint => ".+", :state => "q0r2q1r12q3r25q6r34q2r49q2r?", }, ]
+            },
+            { :fingerprint => IQ[53], :result => { :vendor => "NLnetLabs", :product=>"NSD", :version => "1.0.2"}, :qv => ":version.server", },
+            { :fingerprint => ".+", :state => "q0r2q1r12q3r25q6r34q2a?", },]
           },
-          { :fingerprint => IQ[53], :result => { :vendor => "NLnetLabs", :product=>"NSD", :version => "1.0.2"}, :qv => ":version.server", },
-          { :fingerprint => ".+", :state => "q0r2q1r12q3r25q6r34q2a?", },]
+          { :fingerprint => ".+", :state => "q0r2q1r12q3r25q6r?", },]
         },
-        { :fingerprint => ".+", :state => "q0r2q1r12q3r25q6r?", },]
+        { :fingerprint => IQ[26], :result => { :vendor => "VeriSign", :product => "ATLAS", :version => ""},}, 
+        { :fingerprint => ".+", :state => "q0r2q1r12q3r?", },] 
       },
-      { :fingerprint => IQ[26], :result => { :vendor => "VeriSign", :product => "ATLAS", :version => ""},}, 
-      { :fingerprint => ".+", :state => "q0r2q1r12q3r?", },] 
-    },
-    { :fingerprint => IQ[15],  :header => QY[6], :ruleset => [
-      { :fingerprint => IQ[45], :result => { :vendor => "Nominum", :product =>"ANS", :version =>""}, :qv => ":version.bind",},
-      { :fingerprint => IQ[65], :result => { :vendor => "ISC", :product => "BIND", :version => "9.2.3rc1 -- 9.4.0a0" },  :qv => ":version.bind",},
-      { :fingerprint => IQ[46], :header => QY[7], :ruleset => [
-        { :fingerprint => IQ[56], :result => { :vendor => "ISC", :product => "BIND", :version => "9.0.0b5 -- 9.0.1" }, :qv => ":version.bind",},
-        { :fingerprint => IQ[57], :result => { :vendor => "ISC", :product => "BIND", :version => "9.1.0 -- 9.1.3" }, :qv => ":version.bind",}, 
-        { :fingerprint => ".+", :state => "q0r2q1r15q6r46q7r?", }, ]
+      { :fingerprint => IQ[15],  :header => QY[6], :ruleset => [
+        { :fingerprint => IQ[45], :result => { :vendor => "Nominum", :product =>"ANS", :version =>""}, :qv => ":version.bind",},
+        { :fingerprint => IQ[65], :result => { :vendor => "ISC", :product => "BIND", :version => "9.2.3rc1 -- 9.4.0a4" },  :qv => ":version.bind",},
+        { :fingerprint => IQ[46], :header => QY[7], :ruleset => [
+          { :fingerprint => IQ[56], :result => { :vendor => "ISC", :product => "BIND", :version => "9.0.0b5 -- 9.0.1" }, :qv => ":version.bind",},
+          { :fingerprint => IQ[57], :result => { :vendor => "ISC", :product => "BIND", :version => "9.1.0 -- 9.1.3" }, :qv => ":version.bind",}, 
+          { :fingerprint => ".+", :state => "q0r2q1r15q6r46q7r?", }, ]
+        },
+        { :fingerprint => ".+", :state => "q0r2q1r15q6r?", },]
       },
-      { :fingerprint => ".+", :state => "q0r2q1r15q6r?", },]
-    },
-    { :fingerprint => IQ[16], :header => QY[4], :ruleset => [
-      { :fingerprint => IQ[29], :result => { :vendor => "ISC", :product => "BIND", :version => "9.2.0a1 -- 9.2.0rc3"}, :qv => ":version.bind",},
-      { :fingerprint => IQ[30],  :header => QY[0], :query  => ". A CLASS0" , :ruleset => [
-        { :fingerprint => IQ[2], :result => { :vendor=>"ISC", :product => "BIND", :version =>"9.2.0rc7 -- 9.2.2-P3"}, :qv => ":version.bind", },
-        { :fingerprint => IQ[0], :result => { :vendor=>"ISC", :product => "BIND", :version =>"9.2.0rc4 -- 9.2.0rc6"}, :qv => ":version.bind", },
-        { :fingerprint => ".+", :result => { :vendor => "ISC", :product => "BIND", :version =>"9.2.0rc4 -- 9.2.2-P3"}, :qv => ":version.bind", }, ]
+      { :fingerprint => IQ[16], :header => QY[4], :ruleset => [
+        { :fingerprint => IQ[29], :result => { :vendor => "ISC", :product => "BIND", :version => "9.2.0a1 -- 9.2.0rc3"}, :qv => ":version.bind",},
+        { :fingerprint => IQ[30],  :header => QY[0], :query  => ". A CLASS0" , :ruleset => [
+          { :fingerprint => IQ[2], :result => { :vendor=>"ISC", :product => "BIND", :version =>"9.2.0rc7 -- 9.2.2-P3"}, :qv => ":version.bind", },
+          { :fingerprint => IQ[0], :result => { :vendor=>"ISC", :product => "BIND", :version =>"9.2.0rc4 -- 9.2.0rc6"}, :qv => ":version.bind", },
+          { :fingerprint => ".+", :result => { :vendor => "ISC", :product => "BIND", :version =>"9.2.0rc4 -- 9.2.2-P3"}, :qv => ":version.bind", }, ]
+        },
+        { :fingerprint => ".+", :state => "q0r2q1r16q4r?", },]
       },
-      { :fingerprint => ".+", :state => "q0r2q1r16q4r?", },]
+      { :fingerprint => ".+", :state => "q0r2q1r?", }, ]
     },
-    { :fingerprint => ".+", :state => "q0r2q1r?", }, ]
-  },
-  
-  { :fingerprint => IQ[3], :header => QY[1], :ruleset => [
-    { :fingerprint => "query timed out", :header => QY[5], :ruleset => [
-      { :fingerprint => IQ[3], :result => { :vendor => "sourceforge", :product =>"Dents", :version =>""}, :qv => ":version.bind", },
-      { :fingerprint => IQ[81], :result => { :vendor => "Microsoft", :product => "Windows DNS", :version => "2003" },},
-      { :fingerprint => IQ[91], :result => { :vendor => "Microsoft", :product => "Windows DNS", :version => "2003" },},
-      { :fingerprint => ".+", :state => "q0r3q1tq5r?", }, ]
-      
-    },     
-    { :fingerprint => IQ[14], :result => { :vendor => "UltraDNS", :product => "", :version =>"v2.7.0.2 -- 2.7.3"}, :qv => ":version.bind", }, 
-    { :fingerprint => IQ[13], :header => QY[5], :ruleset => [
-      { :fingerprint => IQ[39], :result => { :vendor => "pliant", :product => "DNS Server", :version =>""},},
-      { :fingerprint => IQ[7], :result => { :vendor => "JHSOFT", :product => "simple DNS plus", :version =>""}, }, 
-      { :fingerprint => IQ[71], :header => QY[6], :ruleset => [
-        { :fingerprint => IQ[41], :result => { :vendor =>"Netnumber", :product =>"ENUM server", :version =>""}, },
-        { :fingerprint => IQ[85], :result => { :vendor =>"Raiden", :product => "DNSD", :version => ""}, }, ]
+    
+    { :fingerprint => IQ[3], :header => QY[1], :ruleset => [
+      { :fingerprint => "query timed out", :header => QY[5], :ruleset => [
+        { :fingerprint => IQ[3], :result => { :vendor => "sourceforge", :product =>"Dents", :version =>""}, :qv => ":version.bind", },
+        { :fingerprint => IQ[81], :result => { :vendor => "Microsoft", :product => "Windows DNS", :version => "2003" },},
+        { :fingerprint => IQ[91], :result => { :vendor => "Microsoft", :product => "Windows DNS", :version => "2003" },},
+        { :fingerprint => ".+", :state => "q0r3q1tq5r?", }, ]
+        
+      },     
+      { :fingerprint => IQ[14], :result => { :vendor => "UltraDNS", :product => "", :version =>"v2.7.0.2 -- 2.7.3"}, :qv => ":version.bind", }, 
+      { :fingerprint => IQ[13], :header => QY[5], :ruleset => [
+        { :fingerprint => IQ[39], :result => { :vendor => "pliant", :product => "DNS Server", :version =>""},},
+        { :fingerprint => IQ[7], :result => { :vendor => "JHSOFT", :product => "simple DNS plus", :version =>""}, }, 
+        { :fingerprint => IQ[71], :header => QY[6], :ruleset => [
+          { :fingerprint => IQ[41], :result => { :vendor =>"Netnumber", :product =>"ENUM server", :version =>""}, },
+          { :fingerprint => IQ[85], :result => { :vendor =>"Raiden", :product => "DNSD", :version => ""}, }, ]
+        },
+        { :fingerprint => ".+", :state => "q0r3q1r13q5r?", }, ]
       },
-      { :fingerprint => ".+", :state => "q0r3q1r13q5r?", }, ]
+      { :fingerprint => ".+", :state => "q0r3q1r?", }, ]
     },
-    { :fingerprint => ".+", :state => "q0r3q1r?", }, ]
-  },
-  
-  { :fingerprint => IQ[4], :header => QY[1], :query=> "jjjjjjjjjjjj IN A", :ruleset => [
-    { :fingerprint => IQ[17], :result => { :vendor => "ISC", :product => "BIND", :version =>"9.0.0b5 -- 9.0.1 [rcursion enabled]"}, :qv => ":version.bind", },
-    { :fingerprint => IQ[18], :header => QY[5], :query=> ". IN A" , :ruleset => [
-      { :fingerprint => IQ[27], :result => { :vendor => "ISC", :product => "BIND", :version => "4.9.3 -- 4.9.11"}, :qv => ":version.bind", },
-      { :fingerprint => IQ[28], :result => { :vendor => "ISC", :product => "BIND", :version => "4.8 -- 4.8.3"}, }, 
-      { :fingerprint => ".+", :state => "q0r4q1r18q5r?", }, ]
+    
+    { :fingerprint => IQ[4], :header => QY[1], :query=> "jjjjjjjjjjjj IN A", :ruleset => [
+      { :fingerprint => IQ[17], :result => { :vendor => "ISC", :product => "BIND", :version =>"9.0.0b5 -- 9.0.1 [recursion enabled]"}, :qv => ":version.bind", },
+      { :fingerprint => IQ[18], :header => QY[5], :query=> ". IN A" , :ruleset => [
+        { :fingerprint => IQ[27], :result => { :vendor => "ISC", :product => "BIND", :version => "4.9.3 -- 4.9.11"}, :qv => ":version.bind", },
+        { :fingerprint => IQ[28], :result => { :vendor => "ISC", :product => "BIND", :version => "4.8 -- 4.8.3"}, }, 
+        { :fingerprint => ".+", :state => "q0r4q1r18q5r?", }, ]
+      },
+      { :fingerprint => IQ[19], :result => {:vendor => "ISC", :product =>"BIND", :version => "8.2.1 [recursion enabled]"}, :qv => ":version.bind", },           
+      { :fingerprint => IQ[20], :header => QY[3], :query=> ". IN A", :ruleset => [
+        { :fingerprint => IQ[42], :result => {:vendor => "ISC", :product =>"BIND", :version =>"8.1-REL -- 8.2.1-T4B [recursion enabled]"}, :qv => ":version.bind", }, 
+        { :fingerprint => ".+", :state => "q0r4q1r20q3r?", },]
+      },
+      { :fingerprint => IQ[21], :header => QY[2], :query => "hostname.bind CH TXT", :ruleset => [
+        { :fingerprint => IQ[60], :result => {:vendor =>"ISC", :product => "BIND", :version => "8.3.0-RC1 -- 8.4.4 [recursion enabled]"},  :qv => ":version.bind",},
+        { :fingerprint => IQ[59], :header => QY[7], :query=> ". IN A", :ruleset => [
+          { :fingerprint => IQ[68], :result => {:vendor =>"ISC", :product => "BIND", :version => "8.1-REL -- 8.2.1-T4B [recursion enabled]"}, :qv => ":version.bind", },
+          { :fingerprint => IQ[69], :result => {:vendor =>"ISC", :product => "BIND", :version => "8.2.2-P3 -- 8.3.0-T2A [recursion enabled]"},  :qv => ":version.bind",},
+          { :fingerprint => "connection failed", :result => { :vendor =>"Runtop", :product => "dsl/cable", :version =>""},},
+          { :fingerprint => ".+", :state => "q0r4q1r21q2r59q7r?", },]
+        },
+        
+        { :fingerprint => IQ[58], :result => {:vendor => "ISC", :product =>"BIND", :version => "8.3.0-RC1 -- 8.4.4 [recursion local]"},  :qv => ":version.bind",},
+        { :fingerprint => IQ[50], :result => {:vendor => "ISC", :product =>"BIND", :version => "8.3.0-RC1 -- 8.4.4 [recursion local]"},  :qv => ":version.bind",},
+        { :fingerprint => IQ[61], :result => {:vendor => "ISC", :product =>"BIND", :version => "8.3.0-RC1 -- 8.4.4 [recursion local]"},  :qv => ":version.bind",},
+        { :fingerprint => IQ[48], :result => {:vendor => "ISC", :product =>"BIND", :version => "8.2.2-P3 -- 8.3.0-T2A [recursion local]"},  :qv => ":version.bind",},
+        { :fingerprint => ".+", :state => "q0r4q1r21q2r?", },]
+      },
+      { :fingerprint => ".+", :state => "q0r4q1r?", }, ]
     },
-    { :fingerprint => IQ[19], :result => {:vendor => "ISC", :product =>"BIND", :version => "8.2.1 [recursion enabled]"}, :qv => ":version.bind", },           
-    { :fingerprint => IQ[20], :header => QY[3], :query=> ". IN A", :ruleset => [
-      { :fingerprint => IQ[42], :result => {:vendor => "ISC", :product =>"BIND", :version =>"8.1-REL -- 8.2.1-T4B [recursion enabled]"}, :qv => ":version.bind", }, 
-      { :fingerprint => ".+", :state => "q0r4q1r20q3r?", },]
+    
+    { :fingerprint => IQ[5], :header => QY[1], :ruleset => [
+      { :fingerprint => IQ[11], :result => { :vendor => "ISC", :product => "BIND", :version => "9.2.3rc1 -- 9.4.0a4", :option => "recursion enabled,split view" }, :qv => ":version.bind",},
+      { :fingerprint => IQ[17], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.3rc1 -- 9.4.0a4 [recursion enabled]"}, :qv => ":version.bind",},
+      { :fingerprint => IQ[18], :header => QY[5], :ruleset => [
+        { :fingerprint => IQ[5], :header => QY[7], :query  => ". IN A", :ruleset => [
+          { :fingerprint => IQ[84], :result => {:vendor => "Nominum", :product =>"CNS", :version => ""}, :qv => ":version.bind",},
+          { :fingerprint => IQ[59], :result => {:vendor => "Mikrotik", :product =>"dsl/cable", :version => ""}, },
+          { :fingerprint => IQ[82], :result => {:vendor => "Mikrotik", :product =>"dsl/cable", :version => ""}, },
+          { :fingerprint => ".+", :state => "q0r5q1r18q5r5q7r?", }, ]
+        },
+  ##      { :fingerprint => IQ[64], :result => "unknown, smells like old BIND 4", },
+        { :fingerprint => ".+", :state => "q0r5q1r18q5r?", }, ]
+      }, 
+      { :fingerprint => IQ[20], :header => QY[7], :ruleset => [
+        { :fingerprint => IQ[54], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.0.0b5 -- 9.0.1 [recursion enabled]"}, :qv => ":version.bind",},
+        { :fingerprint => IQ[55], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.1.0 -- 9.1.3 [recursion enabled]"}, :qv => ":version.bind",},
+        { :fingerprint => IQ[63], :result => {:vendor => "ISC", :product =>"BIND", :version => "4.9.3 -- 4.9.11 [recursion enabled]"}, :qv => ":version.bind",},
+        { :fingerprint => IQ[61], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.0.0b5 -- 9.1.3 [recursion local]"}, :qv => ":version.bind",},
+        { :fingerprint => ".+", :state => "q0r5q1r20q7r?", }, ]
+      },   
+      { :fingerprint => IQ[21], :header => QY[4], :ruleset => [
+        { :fingerprint => "query timed out", :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0a1 -- 9.2.2-P3 [recursion enabled]"}, :qv => ":version.bind", },
+        { :fingerprint => IQ[29], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0a1 -- 9.2.0rc3 [recursion enabled]"}, :qv => ":version.bind", },
+        { :fingerprint => IQ[61], :header => QY[0], :query  => ". A CLASS0" , :ruleset => [
+          { :fingerprint => IQ[2], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0rc7 -- 9.2.2-P3 [recursion local]"}, :qv => ":version.bind", },
+          { :fingerprint => IQ[0], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0a1 -- 9.2.0rc6 [recursion local]"}, :qv => ":version.bind", },
+          { :fingerprint => ".+", :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0a1 -- 9.2.2-P3 [recursion local]"}, :qv => ":version.bind", }, ]
+        },
+        { :fingerprint => IQ[30], :header => QY[0], :query  => ". A CLASS0" , :ruleset => [
+          { :fingerprint => IQ[2], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0rc7 -- 9.2.2-P3 [recursion enabled]"}, :qv => ":version.bind", },
+          { :fingerprint => IQ[0], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0rc4 -- 9.2.0rc6 [recursion enabled]"}, :qv => ":version.bind", },
+          { :fingerprint => ".+", :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0rc4 -- 9.2.2-P3 [recursion enabled]"}, :qv => ":version.bind", }, ] 
+        },
+        { :fingerprint => ".+", :state => "q0r5q1r21q4r?", }, ]
+      }, 
+      { :fingerprint => ".+", :state => "q0r5q1r?", }, ]
     },
-    { :fingerprint => IQ[21], :header => QY[2], :query => "hostname.bind CH TXT", :ruleset => [
-      { :fingerprint => IQ[60], :result => {:vendor =>"ISC", :product => "BIND", :version => "8.3.0-RC1 -- 8.4.4 [recursion enabled]"},  :qv => ":version.bind",},
-      { :fingerprint => IQ[59], :header => QY[7], :query=> ". IN A", :ruleset => [
-        { :fingerprint => IQ[68], :result => {:vendor =>"ISC", :product => "BIND", :version => "8.1-REL -- 8.2.1-T4B [recursion enabled]"}, :qv => ":version.bind", },
-        { :fingerprint => IQ[69], :result => {:vendor =>"ISC", :product => "BIND", :version => "8.2.2-P3 -- 8.3.0-T2A [recursion enabled]"},  :qv => ":version.bind",},
-        { :fingerprint => "connection failed", :result => { :vendor =>"Runtop", :product => "dsl/cable", :version =>""},},
-        { :fingerprint => ".+", :state => "q0r4q1r21q2r59q7r?", },]
+    
+    { :fingerprint => IQ[6], :header => QY[1], :ruleset => [
+      { :fingerprint => IQ[15], :result => {:vendor => "incognito", :product =>"DNS commander", :version => "v2.3.1.1 -- 4.0.5.1"}, :qv => ":version.bind",  },
+      { :fingerprint => IQ[19], :header => QY[3], :ruleset => [
+        { :fingerprint => IQ[66], :result => {:vendor => "vermicelli", :product =>"totd", :version => ""}, },
+        { :fingerprint => IQ[67], :result => {:vendor => "JHSOFT", :product =>"simple DNS plus", :version => "[recursion enabled]"}, }, 
+        { :fingerprint => ".+", :state => "q0r6q1r19q3r?", }, ]
       },
-      
-      { :fingerprint => IQ[58], :result => {:vendor => "ISC", :product =>"BIND", :version => "8.3.0-RC1 -- 8.4.4 [recursion local]"},  :qv => ":version.bind",},
-      { :fingerprint => IQ[50], :result => {:vendor => "ISC", :product =>"BIND", :version => "8.3.0-RC1 -- 8.4.4 [recursion local]"},  :qv => ":version.bind",},
-      { :fingerprint => IQ[61], :result => {:vendor => "ISC", :product =>"BIND", :version => "8.3.0-RC1 -- 8.4.4 [recursion local]"},  :qv => ":version.bind",},
-      { :fingerprint => IQ[48], :result => {:vendor => "ISC", :product =>"BIND", :version => "8.2.2-P3 -- 8.3.0-T2A [recursion local]"},  :qv => ":version.bind",},
-      { :fingerprint => ".+", :state => "q0r4q1r21q2r?", },]
+      { :fingerprint => ".+", :state => "q0r6q1r?", }, ]
     },
-    { :fingerprint => ".+", :state => "q0r4q1r?", }, ]
-  },
-  
-  { :fingerprint => IQ[5], :header => QY[1], :ruleset => [
-    { :fingerprint => IQ[11], :result => { :vendor => "ISC", :product => "BIND", :version => "9.2.3rc1 -- 9.4.0a0", :option => "recursion enabled,split view" }, :qv => ":version.bind",},
-    { :fingerprint => IQ[17], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.3rc1 -- 9.4.0a0 [recursion enabled]"}, :qv => ":version.bind",},
-    { :fingerprint => IQ[18], :header => QY[5], :ruleset => [
-      { :fingerprint => IQ[5], :header => QY[7], :query  => ". IN A", :ruleset => [
-        { :fingerprint => IQ[84], :result => {:vendor => "Nominum", :product =>"CNS", :version => ""}, :qv => ":version.bind",},
-        { :fingerprint => IQ[59], :result => {:vendor => "Mikrotik", :product =>"dsl/cable", :version => ""}, },
-        { :fingerprint => IQ[82], :result => {:vendor => "Mikrotik", :product =>"dsl/cable", :version => ""}, },
-        { :fingerprint => ".+", :state => "q0r5q1r18q5r5q7r?", }, ]
-      },
-##      { :fingerprint => IQ[64], :result => "unknown, smells like old BIND 4", },
-      { :fingerprint => ".+", :state => "q0r5q1r18q5r?", }, ]
-    }, 
-    { :fingerprint => IQ[20], :header => QY[7], :ruleset => [
-      { :fingerprint => IQ[54], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.0.0b5 -- 9.0.1 [recursion enabled]"}, :qv => ":version.bind",},
-      { :fingerprint => IQ[55], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.1.0 -- 9.1.3 [recursion enabled]"}, :qv => ":version.bind",},
-      { :fingerprint => IQ[63], :result => {:vendor => "ISC", :product =>"BIND", :version => "4.9.3 -- 4.9.11 [recursion enabled]"}, :qv => ":version.bind",},
-      { :fingerprint => IQ[61], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.0.0b5 -- 9.1.3 [recursion local]"}, :qv => ":version.bind",},
-      { :fingerprint => ".+", :state => "q0r5q1r20q7r?", }, ]
-    },   
-    { :fingerprint => IQ[21], :header => QY[4], :ruleset => [
-      { :fingerprint => "query timed out", :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0a1 -- 9.2.2-P3 [recursion enabled]"}, :qv => ":version.bind", },
-      { :fingerprint => IQ[29], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0a1 -- 9.2.0rc3 [recursion enabled]"}, :qv => ":version.bind", },
-      { :fingerprint => IQ[61], :header => QY[0], :query  => ". A CLASS0" , :ruleset => [
-        { :fingerprint => IQ[2], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0rc7 -- 9.2.2-P3 [recursion local]"}, :qv => ":version.bind", },
-        { :fingerprint => IQ[0], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0a1 -- 9.2.0rc6 [recursion local]"}, :qv => ":version.bind", },
-        { :fingerprint => ".+", :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0a1 -- 9.2.2-P3 [recursion local]"}, :qv => ":version.bind", }, ]
+    
+    { :fingerprint => IQ[7], :header => QY[1], :ruleset => [
+      { :fingerprint => IQ[22], :header => QY[3], :ruleset => [
+        { :fingerprint => IQ[97], :result => {:vendor => "PowerDNS", :product =>"PowerDNS", :version => "2.9.4 -- 2.9.19"}, :qv => "version.bind", }, 
+        { :fingerprint => IQ[98], :result => {:vendor => "Stanford", :product =>"lbnamed", :version => "1.0.0 -- 2.3.2"}, },
+        { :fingerprint => ".+", :state => "q0r7q1r22q3r?", }, ]
       },
-      { :fingerprint => IQ[30], :header => QY[0], :query  => ". A CLASS0" , :ruleset => [
-        { :fingerprint => IQ[2], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0rc7 -- 9.2.2-P3 [recursion enabled]"}, :qv => ":version.bind", },
-        { :fingerprint => IQ[0], :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0rc4 -- 9.2.0rc6 [recursion enabled]"}, :qv => ":version.bind", },
-        { :fingerprint => ".+", :result => {:vendor => "ISC", :product =>"BIND", :version => "9.2.0rc4 -- 9.2.2-P3 [recursion enabled]"}, :qv => ":version.bind", }, ] 
+      { :fingerprint => IQ[24], :result => {:vendor => "PowerDNS", :product =>"PowerDNS", :version => "2.8 -- 2.9.3"}, :qv => ":version.bind", },
+      { :fingerprint => ".+", :state => "q0r7q1r?", }, ]
+    },
+    
+    { :fingerprint => IQ[8], :header => QY[1], :ruleset => [
+      { :fingerprint => IQ[23], :header => QY[2] , :query => ". CH A", :ruleset => [
+        { :fingerprint => "query timed out", :result => { :vendor => "DJ Bernstein", :product => "TinyDNS", :version => "1.04"} ,},
+        { :fingerprint => IQ[32], :result => {:vendor => "DJ Bernstein", :product => "TinyDNS", :version => "1.05"} ,}, 
+        { :fingerprint => ".+", :state => "q0r8q1r23q2r?",},]
       },
-      { :fingerprint => ".+", :state => "q0r5q1r21q4r?", }, ]
-    }, 
-    { :fingerprint => ".+", :state => "q0r5q1r?", }, ]
-  },
-  
-  { :fingerprint => IQ[6], :header => QY[1], :ruleset => [
-    { :fingerprint => IQ[15], :result => {:vendor => "incognito", :product =>"DNS commander", :version => "v2.3.1.1 -- 4.0.5.1"}, :qv => ":version.bind",  },
-    { :fingerprint => IQ[19], :header => QY[3], :ruleset => [
-      { :fingerprint => IQ[66], :result => {:vendor => "vermicelli", :product =>"totd", :version => ""}, },
-      { :fingerprint => IQ[67], :result => {:vendor => "JHSOFT", :product =>"simple DNS plus", :version => "[recursion enabled]"}, }, 
-      { :fingerprint => ".+", :state => "q0r6q1r19q3r?", }, ]
+      { :fingerprint => ".+", :state => "q0r8q1r?", }, ]
     },
-    { :fingerprint => ".+", :state => "q0r6q1r?", }, ]
-  },
-  
-  { :fingerprint => IQ[7], :header => QY[1], :ruleset => [
-    { :fingerprint => IQ[22], :result => {:vendor => "PowerDNS", :product =>"PowerDNS", :version => "2.9.4 -- 2.9.11"}, :qv => ":version.bind", },
-    { :fingerprint => IQ[24], :result => {:vendor => "PowerDNS", :product =>"PowerDNS", :version => "2.8 -- 2.9.3"}, :qv => ":version.bind", },
-    { :fingerprint => ".+", :state => "q0r7q1r?", }, ]
-  },
-  
-  { :fingerprint => IQ[8], :header => QY[1], :ruleset => [
-    { :fingerprint => IQ[23], :header => QY[2] , :query => ". CH A", :ruleset => [
-      { :fingerprint => "query timed out", :result => { :vendor => "DJ Bernstein", :product => "TinyDNS", :version => "1.04"} ,},
-      { :fingerprint => IQ[32], :result => {:vendor => "DJ Bernstein", :product => "TinyDNS", :version => "1.05"} ,}, 
-      { :fingerprint => ".+", :state => "q0r8q1r23q2r?",},]
+    
+    { :fingerprint => IQ[9], :header => QY[1], :ruleset => [
+      { :fingerprint => IQ[9], :result => { :vendor => "Sam Trenholme", :product =>"MaraDNS", :version => ""}, :qv => "erre-con-erre-cigarro.maradns.org"}, 
+      { :fingerprint => ".+", :state => "q0r9q1r?", }, ]
     },
-    { :fingerprint => ".+", :state => "q0r8q1r?", }, ]
-  },
+    
+    { :fingerprint => IQ[10], :result => { :vendor => "Microsoft", :product =>"?", :version => ""}, },
+    { :fingerprint => IQ[26], :result => { :vendor => "Meilof Veeningen", :product =>"Posadis", :version =>""}, },
+    { :fingerprint => IQ[43], :header => QY[6], :ruleset => [
+      { :fingerprint => IQ[34], :result => { :vendor => "Paul Rombouts", :product =>"pdnsd", :version =>""}, },
+      { :fingerprint => IQ[75], :result => { :vendor => "antirez", :product =>"Yaku-NS", :version =>""}, },
+      { :fingerprint => ".+", :state => "q0r43q6r?", }, ]
+    },
+    
+    { :fingerprint => IQ[44], :result => { :vendor =>"cpan", :product=>"Net::DNS Nameserver", :version =>""}, :qv => ":version.bind", },
+    { :fingerprint => IQ[52], :result => { :vendor =>"NLnetLabs", :product=>"NSD", :version => "1.0 alpha"}, },
   
-  { :fingerprint => IQ[9], :header => QY[1], :ruleset => [
-    { :fingerprint => IQ[9], :result => { :vendor => "Sam Trenholme", :product =>"MaraDNS", :version => ""}, :qv => "erre-con-erre-cigarro.maradns.org"}, 
-    { :fingerprint => ".+", :state => "q0r9q1r?", }, ]
-  },
+    { :fingerprint => IQ[55], :header => QY[3], :ruleset => [
+      { :fingerprint => IQ[94], :result => { :vendor =>"robtex", :product=>"Viking DNS module", :version=>""}, },
+      { :fingerprint => IQ[95], :result => { :vendor =>"cisco", :product=>"dns resolver/server", :version=>""}, },
+      { :fingerprint => ".+", :state => "q0r55q3r?", }, ]
+    },
   
-  { :fingerprint => IQ[10], :result => { :vendor => "Microsoft", :product =>"?", :version => ""}, },
-  { :fingerprint => IQ[26], :result => { :vendor => "Meilof Veeningen", :product =>"Posadis", :version =>""}, },
-  { :fingerprint => IQ[43], :header => QY[6], :ruleset => [
-    { :fingerprint => IQ[34], :result => { :vendor => "Paul Rombouts", :product =>"pdnsd", :version =>""}, },
-    { :fingerprint => IQ[75], :result => { :vendor => "antirez", :product =>"Yaku-NS", :version =>""}, },
-    { :fingerprint => ".+", :state => "q0r43q6r?", }, ]
-  },
+    { :fingerprint => IQ[59], :result => { :vendor =>"Max Feoktistov", :product=>"small HTTP server [recursion enabled]", :version =>""}, },
+    { :fingerprint => IQ[60], :result => { :vendor =>"Axis", :product=>"video server", :version =>""}, },
   
-  { :fingerprint => IQ[44], :result => { :vendor =>"cpan", :product=>"Net::DNS Nameserver", :version =>""}, :qv => ":version.bind", },
-  { :fingerprint => IQ[52], :result => { :vendor =>"NLnetLabs", :product=>"NSD", :version => "1.0 alpha"}, },
-  { :fingerprint => IQ[55], :result => { :vendor =>"robtex", :product=>"Viking DNS module", :version=>""}, },
-  { :fingerprint => IQ[59], :result => { :vendor =>"Max Feoktistov", :product=>"small HTTP server [recursion enabled]", :version =>""}, },
-  { :fingerprint => IQ[60], :result => { :vendor =>"Axis", :product=>"video server", :version =>""}, },
-  { :fingerprint => IQ[62], :header => QY[7], :query => "1.0.0.127.in-addr.arpa. IN PTR", :ruleset => [
-    { :fingerprint => IQ[62], :result => { :vendor =>"Michael Tokarev", :product=>"rbldnsd",:version=>""}, :qv => ":version.bind", },
-    { :fingerprint => IQ[79], :result => { :vendor =>"4D", :product=>"WebSTAR", :version=>""}, },
-    { :fingerprint => IQ[83], :result => { :vendor =>"Netopia", :product =>"dsl/cable", :version => ""},},
-    { :fingerprint => IQ[90], :result => { :vendor =>"TZO", :product=>"Tzolkin DNS",:version=>""}, },
-    { :fingerprint => "query timed out", :result => { :vendor =>"Netopia", :product =>"dsl/cable", :version=>""},},
-    { :fingerprint => ".+", :state => "q0r62q7r?", }, ]
-  },
-  { :fingerprint => IQ[70], :result => { :vendor =>"Yutaka Sato", :product=>"DeleGate DNS", :version=>""},},
-  { :fingerprint => IQ[72], :result => { :vendor =>"", :product =>"sheerdns", :version=>""}, },
-  { :fingerprint => IQ[73], :result => { :vendor =>"Matthew Pratt", :product=>"dproxy", :version=>""}, },
-  { :fingerprint => IQ[74], :result => { :vendor =>"Brad Garcia", :product=>"dnrd",:version=>""}, },
-  { :fingerprint => IQ[76], :result => { :vendor =>"Sourceforge", :product=>"JDNSS",:version=>""}, },
-  { :fingerprint => IQ[77], :result => { :vendor =>"Dan Kaminsky", :product=>"nomde DNS tunnel",:version=>""}, },
-  { :fingerprint => IQ[78], :result => { :vendor =>"Max Feoktistov", :product=>"small HTTP server", :version =>""}, },
-  { :fingerprint => IQ[79], :result => { :vendor =>"robtex", :product=>"Viking DNS module", :version=>""}, },
-  { :fingerprint => IQ[80], :result => { :vendor =>"Fasthosts", :product=>"Envisage DNS server", :version=>""}, },
-  { :fingerprint => IQ[81], :result => { :vendor =>"WinGate", :product=>"Wingate DNS", :version=>""},},
-  { :fingerprint => IQ[82], :result => { :vendor =>"Ascenvision", :product=>"SwiftDNS", :version=>""},},
-  { :fingerprint => IQ[86], :result => { :vendor =>"Nortel Networks", :product=>"Instant Internet",:version=>""}, },
-  { :fingerprint => IQ[87], :result => { :vendor =>"ATOS", :product=>"Stargate ADSL", :version=>""},},
-  { :fingerprint => IQ[88], :result => { :vendor =>"3Com", :product=>"Office Connect Remote", :version=>""},},
-  { :fingerprint => IQ[89], :result => { :vendor =>"Alteon", :product=>"ACEswitch", :version=>""},},
-  { :fingerprint => IQ[90], :result => { :vendor =>"javaprofessionals", :product=>"javadns/jdns", :version=>""},},
+    { :fingerprint => IQ[62], :header => QY[7], :query => "1.0.0.127.in-addr.arpa. IN PTR", :ruleset => [
+      { :fingerprint => IQ[62], :result => { :vendor =>"Michael Tokarev", :product=>"rbldnsd",:version=>""}, :qv => ":version.bind", },
+      { :fingerprint => IQ[79], :result => { :vendor =>"4D", :product=>"WebSTAR", :version=>""}, },
+      { :fingerprint => IQ[83], :result => { :vendor =>"Netopia", :product =>"dsl/cable", :version => ""},},
+      { :fingerprint => IQ[90], :result => { :vendor =>"TZO", :product=>"Tzolkin DNS",:version=>""}, },
+      { :fingerprint => "query timed out", :result => { :vendor =>"Netopia", :product =>"dsl/cable", :version=>""},},
+      { :fingerprint => ".+", :state => "q0r62q7r?", }, ]
+    },
   
-  { :fingerprint => IQ[92], :result => { :vendor =>"Beehive", :product=>"CoDoNS",:version=>""}, },
-  { :fingerprint => ".+", :state => "q0r?", }, 
+    { :fingerprint => IQ[70], :result => { :vendor =>"Yutaka Sato", :product=>"DeleGate DNS", :version=>""},},
+    { :fingerprint => IQ[72], :result => { :vendor =>"", :product =>"sheerdns", :version=>""}, },
+    { :fingerprint => IQ[73], :result => { :vendor =>"Matthew Pratt", :product=>"dproxy", :version=>""}, },
+    { :fingerprint => IQ[74], :result => { :vendor =>"Brad Garcia", :product=>"dnrd",:version=>""}, },
+    { :fingerprint => IQ[76], :result => { :vendor =>"Sourceforge", :product=>"JDNSS",:version=>""}, },
+    { :fingerprint => IQ[77], :result => { :vendor =>"Dan Kaminsky", :product=>"nomde DNS tunnel",:version=>""}, },
+    { :fingerprint => IQ[78], :result => { :vendor =>"Max Feoktistov", :product=>"small HTTP server", :version =>""}, },
+    { :fingerprint => IQ[79], :result => { :vendor =>"robtex", :product=>"Viking DNS module", :version=>""}, },
+    { :fingerprint => IQ[80], :result => { :vendor =>"Fasthosts", :product=>"Envisage DNS server", :version=>""}, },
+    { :fingerprint => IQ[81], :result => { :vendor =>"WinGate", :product=>"Wingate DNS", :version=>""},},
+    { :fingerprint => IQ[82], :result => { :vendor =>"Ascenvision", :product=>"SwiftDNS", :version=>""},},
+    { :fingerprint => IQ[86], :result => { :vendor =>"Nortel Networks", :product=>"Instant Internet",:version=>""}, },
+    { :fingerprint => IQ[87], :result => { :vendor =>"ATOS", :product=>"Stargate ADSL", :version=>""},},
+    { :fingerprint => IQ[88], :result => { :vendor =>"3Com", :product=>"Office Connect Remote", :version=>""},},
+    { :fingerprint => IQ[89], :result => { :vendor =>"Alteon", :product=>"ACEswitch", :version=>""},},
+    { :fingerprint => IQ[90], :result => { :vendor =>"javaprofessionals", :product=>"javadns/jdns", :version=>""},},
+    { :fingerprint => IQ[92], :result => { :vendor =>"Beehive", :product=>"CoDoNS",:version=>""}, },
+    { :fingerprint => IQ[96], :result => { :vendor =>"Beevihe", :product=>"AAAAAA",:version=>""}, :qv => "version.bind", },
+    { :fingerprint => IQ[100], :result => { :vendor =>"ValidStream", :product=>"ValidDNS",:version=>""}, },
+    { :fingerprint => IQ[101], :result => { :vendor =>"ValidStream", :product=>"ValidDNS",:version=>""}, },
+    { :fingerprint => ".+", :state => "q0r?", }, ]
+  }
   
   ].freeze
 end