From 0b8987f2af6fa9a939412cbeaff1d0143a117a32 Mon Sep 17 00:00:00 2001 From: HD Moore Date: Tue, 31 Jan 2012 01:29:44 -0600 Subject: [PATCH] Merge results initialization fix --- data/php/bind_tcp_ipv6.php | 0 modules/auxiliary/scanner/discovery/udp_probe.rb | 4 +--- modules/auxiliary/scanner/discovery/udp_sweep.rb | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) mode change 100644 => 100755 data/php/bind_tcp_ipv6.php diff --git a/data/php/bind_tcp_ipv6.php b/data/php/bind_tcp_ipv6.php old mode 100644 new mode 100755 diff --git a/modules/auxiliary/scanner/discovery/udp_probe.rb b/modules/auxiliary/scanner/discovery/udp_probe.rb index 21022981b7..266a961a3f 100644 --- a/modules/auxiliary/scanner/discovery/udp_probe.rb +++ b/modules/auxiliary/scanner/discovery/udp_probe.rb @@ -66,7 +66,7 @@ class Metasploit3 < Msf::Auxiliary # Fingerprint a single host def run_host(ip) - + @results = {} @thost = ip begin @@ -140,8 +140,6 @@ class Metasploit3 < Msf::Auxiliary # The response parsers # def parse_reply(pkt) - - @results ||= {} # Ignore "empty" packets return if not pkt[1] diff --git a/modules/auxiliary/scanner/discovery/udp_sweep.rb b/modules/auxiliary/scanner/discovery/udp_sweep.rb index 5420cb76cd..368191d105 100644 --- a/modules/auxiliary/scanner/discovery/udp_sweep.rb +++ b/modules/auxiliary/scanner/discovery/udp_sweep.rb @@ -73,6 +73,8 @@ class Metasploit3 < Msf::Auxiliary # Fingerprint a single host def run_batch(batch) + @results = {} + print_status("Sending #{@probes.length} probes to #{batch[0]}->#{batch[-1]} (#{batch.length} hosts)") begin @@ -171,7 +173,6 @@ class Metasploit3 < Msf::Auxiliary # The response parsers # def parse_reply(pkt) - @results ||= {} # Ignore "empty" packets return if not pkt[1]