Revert errored merge of deea30d

Revert "Merge branch 'master' of https://github.com/farias-r7/metasploit-framework into upstream-master"

This reverts commit deea30d, reversing
changes made to 14514d7.

Author: Tod Beardsley

.rubocop.yml

@@ -8,7 +8,7 @@
 
 # inherit_from: .rubocop_todo.yml
 
-Metrics/ClassLength:
+Style/ClassLength:
   Description: 'Most Metasploit modules are quite large. This is ok.'
   Enabled: true
   Exclude:
@@ -25,14 +25,14 @@ Style/Encoding:
   Description: 'We prefer binary to UTF-8.'
   EnforcedStyle: 'when_needed'
 
-Metrics/LineLength:
+Style/LineLength:
   Description: >-
                   Metasploit modules often pattern match against very
                   long strings when identifying targets.
   Enabled: true
   Max: 180
 
-Metrics/MethodLength:
+Style/MethodLength:
   Enabled: true
   Description: >-
                   While the style guide suggests 10 lines, exploit definitions
@@ -44,11 +44,6 @@ Metrics/MethodLength:
 Style/Encoding:
   Enabled: false
 
-# %q() is super useful for long strings split over multiple lines and
-# is very common in module constructors for things like descriptions
-Style/UnneededPercentQ:
-  Enabled: false
-
 Style/NumericLiterals:
   Enabled: false
   Description: 'This often hurts readability for exploit-ish code.'

lib/msf/core/auxiliary/scanner.rb

@@ -241,10 +241,10 @@ def scanner_progress
 
 def scanner_show_progress
   pct = scanner_progress
-  if pct >= (@range_percent + @show_percent)
+  if(pct >= (@range_percent + @show_percent))
     @range_percent = @range_percent + @show_percent
     tdlen = @range_count.to_s.length
-    print_status(sprintf("Scanned %#{tdlen}d of %d hosts (%d%% complete)", @range_done, @range_count, pct))
+    print_status("Scanned #{"%.#{tdlen}d" % @range_done} of #{@range_count} hosts (#{"%.3d" % pct.to_i}% complete)")
   end
 end
 

lib/msf/core/auxiliary/udp_scanner.rb

@@ -8,36 +8,33 @@ module Msf
 #
 ###
 module Auxiliary::UDPScanner
-  include Auxiliary::Scanner
 
-  # A hash of results of a given batch run, keyed by host
-  attr_accessor :results
+  include Auxiliary::Scanner
 
   #
   # Initializes an instance of an auxiliary module that scans UDP
   #
+
   def initialize(info = {})
     super
 
     register_options(
     [
-      Opt::RPORT,
+      Opt::CHOST,
       OptInt.new('BATCHSIZE', [true, 'The number of hosts to probe in each set', 256]),
-      OptInt.new('THREADS', [true, "The number of concurrent threads", 10])
     ], self.class)
 
     register_advanced_options(
     [
-      Opt::CHOST,
-      Opt::CPORT,
       OptInt.new('ScannerRecvInterval', [true, 'The maximum numbers of sends before entering the processing loop', 30]),
       OptInt.new('ScannerMaxResends', [true, 'The maximum times to resend a packet when out of buffers', 10]),
       OptInt.new('ScannerRecvQueueLimit', [true, 'The maximum queue size before breaking out of the processing loop', 100]),
-      OptInt.new('ScannerRecvWindow', [true, 'The number of seconds to wait post-scan to catch leftover replies', 15])
+      OptInt.new('ScannerRecvWindow', [true, 'The number of seconds to wait post-scan to catch leftover replies', 15]),
 
     ], self.class)
   end
 
+
   # Define our batch size
   def run_batch_size
     datastore['BATCHSIZE'].to_i
@@ -47,7 +44,6 @@ def run_batch_size
   def run_batch(batch)
     @udp_sock = Rex::Socket::Udp.create({
       'LocalHost' => datastore['CHOST'] || nil,
-      'LocalPort' => datastore['CPORT'] || 0,
       'Context'   => { 'Msf' => framework, 'MsfExploit' => self }
     })
     add_socket(@udp_sock)
@@ -159,25 +155,12 @@ def scanner_recv(timeout=0.1)
     queue.length
   end
 
-  def cport
-    datastore['CPORT']
-  end
-
-  def rport
-    datastore['RPORT']
-  end
-
   #
-  # The including module may override some of these methods
+  # The including module override these methods
   #
 
-  # Builds and returns the probe to be sent
-  def build_probe
-  end
-
-  # Called for each IP in the batch.  This will send all necessary probes.
+  # Called for each IP in the batch
   def scan_host(ip)
-    scanner_send(build_probe, ip, rport)
   end
 
   # Called for each response packet
@@ -186,12 +169,11 @@ def scanner_process(data, shost, sport)
 
   # Called before the scan block
   def scanner_prescan(batch)
-    vprint_status("Sending probes to #{batch[0]}->#{batch[-1]} (#{batch.length} hosts)")
-    @results = {}
   end
 
   # Called after the scan block
   def scanner_postscan(batch)
   end
+
 end
 end