refactored the code based on PR feedback

Author: jabra-

lib/msf/core/auxiliary/ntp.rb

@@ -1,6 +1,6 @@
 # -*- coding: binary -*-
 require 'rex/proto/ntp'
-
+require 'msf/core/exploit'
 module Msf
 
 ###
@@ -10,6 +10,7 @@ module Msf
 ###
 module Auxiliary::NTP
 
+  include Exploit::Capture
   include Auxiliary::Scanner
 
   #
@@ -29,5 +30,15 @@ def initialize(info = {})
         OptInt.new('IMPLEMENTATION', [true, 'Use this NTP mode 7 implementation', 3])
       ], self.class)
   end
+
+  # Called for each IP in the batch
+  def scan_host(ip)
+    if spoofed?
+      datastore['ScannerRecvWindow'] = 0
+      scanner_spoof_send(@probe, ip, datastore['RPORT'], datastore['SRCIP'], datastore['NUM_REQUESTS'])
+    else
+      scanner_send(@probe, ip, datastore['RPORT'])
+    end
+  end
 end
 end

lib/msf/core/auxiliary/udp_scanner.rb

@@ -80,8 +80,8 @@ def scanner_spoof_send(data, ip, port, srcip, num_packets=1)
     p.udp_dst = port
     p.payload = @probe
     p.recalc
+    print_status("Sending #{num_packets} packet(s) to #{ip} from #{srcip}")
     1.upto(num_packets) do |x|
-      print_status("Sending packet to #{ip} from #{srcip}")
       capture_sendto(p, ip)
     end
     close_pcap

modules/auxiliary/scanner/ntp/ntp_monlist.rb

@@ -8,7 +8,6 @@
 class Metasploit3 < Msf::Auxiliary
 
   include Msf::Auxiliary::Report
-  include Msf::Exploit::Capture
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::UDPScanner
   include Msf::Auxiliary::NTP
@@ -47,17 +46,7 @@ def initialize
     ], self.class)
   end
 
-  # Called for each IP in the batch
-  def scan_host(ip)
-    if spoofed?
-      datastore['ScannerRecvWindow'] = 0
-      scanner_spoof_send(@probe, ip, datastore['RPORT'], datastore['SRCIP'], datastore['NUM_REQUESTS'])
-    else
-      scanner_send(@probe, ip, datastore['RPORT'])
-    end
-  end
-
-  # Called for each response packet
+# Called for each response packet
   def scanner_process(data, shost, sport)
     @results[shost] ||= { messages: [], peers: [] }
     @results[shost][:messages] << Rex::Proto::NTP::NTPPrivate.new(data)

modules/auxiliary/scanner/ntp/ntp_peer_list_dos.rb

@@ -8,7 +8,6 @@
 class Metasploit3 < Msf::Auxiliary
 
   include Msf::Auxiliary::Report
-  include Msf::Exploit::Capture
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::UDPScanner
   include Msf::Auxiliary::NTP
@@ -35,16 +34,6 @@ def initialize
     )
   end
 
-  # Called for each IP in the batch
-  def scan_host(ip)
-    if spoofed?
-      datastore['ScannerRecvWindow'] = 0
-      scanner_spoof_send(@probe, ip, datastore['RPORT'], datastore['SRCIP'], datastore['NUM_REQUESTS'])
-    else
-      scanner_send(@probe, ip, datastore['RPORT'])
-    end
-  end
-
   # Called before the scan block
   def scanner_prescan(batch)
     @results = {}

modules/auxiliary/scanner/ntp/ntp_peer_list_sum_dos.rb

@@ -8,7 +8,6 @@
 class Metasploit3 < Msf::Auxiliary
 
   include Msf::Auxiliary::Report
-  include Msf::Exploit::Capture
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::UDPScanner
   include Msf::Auxiliary::NTP
@@ -35,16 +34,6 @@ def initialize
     )
   end
 
-  # Called for each IP in the batch
-  def scan_host(ip)
-    if spoofed?
-      datastore['ScannerRecvWindow'] = 0
-      scanner_spoof_send(@probe, ip, datastore['RPORT'], datastore['SRCIP'], datastore['NUM_REQUESTS'])
-    else
-      scanner_send(@probe, ip, datastore['RPORT'])
-    end
-  end
-
   # Called for each response packet
   def scanner_process(data, shost, sport)
     @results[shost] ||= []

modules/auxiliary/scanner/ntp/ntp_req_nonce_dos.rb

@@ -8,7 +8,6 @@
 class Metasploit3 < Msf::Auxiliary
 
   include Msf::Auxiliary::Report
-  include Msf::Exploit::Capture
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::UDPScanner
   include Msf::Auxiliary::NTP
@@ -36,16 +35,6 @@ def initialize
     )
   end
 
-  # Called for each IP in the batch
-  def scan_host(ip)
-    if spoofed?
-      datastore['ScannerRecvWindow'] = 0
-      scanner_spoof_send(@probe, ip, datastore['RPORT'], datastore['SRCIP'], datastore['NUM_REQUESTS'])
-    else
-      scanner_send(@probe, ip, datastore['RPORT'])
-    end
-  end
-
   # Called for each response packet
   def scanner_process(data, shost, sport)
     @results[shost] ||= []

modules/auxiliary/scanner/ntp/ntp_reslist_dos.rb

@@ -8,7 +8,6 @@
 class Metasploit3 < Msf::Auxiliary
 
   include Msf::Auxiliary::Report
-  include Msf::Exploit::Capture
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::UDPScanner
   include Msf::Auxiliary::NTP
@@ -37,16 +36,6 @@ def initialize
     )
   end
 
-  # Called for each IP in the batch
-  def scan_host(ip)
-    if spoofed?
-      datastore['ScannerRecvWindow'] = 0
-      scanner_spoof_send(@probe, ip, datastore['RPORT'], datastore['SRCIP'], datastore['NUM_REQUESTS'])
-    else
-      scanner_send(@probe, ip, datastore['RPORT'])
-    end
-  end
-
   # Called for each response packet
   def scanner_process(data, shost, sport)
     @results[shost] ||= []

modules/auxiliary/scanner/ntp/ntp_unsettrap_dos.rb

@@ -8,7 +8,6 @@
 class Metasploit3 < Msf::Auxiliary
 
   include Msf::Auxiliary::Report
-  include Msf::Exploit::Capture
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::UDPScanner
   include Msf::Auxiliary::NTP
@@ -35,16 +34,6 @@ def initialize
     )
   end
 
-  # Called for each IP in the batch
-  def scan_host(ip)
-    if spoofed?
-      datastore['ScannerRecvWindow'] = 0
-      scanner_spoof_send(@probe, ip, datastore['RPORT'], datastore['SRCIP'], datastore['NUM_REQUESTS'])
-    else
-      scanner_send(@probe, ip, datastore['RPORT'])
-    end
-  end
-
   # Called for each response packet
   def scanner_process(data, shost, sport)
     @results[shost] ||= []