Merge pull request #1 from jhart-r7/landing-4265-jhart

This is a great intermediate approach, thanks @jhart-r7 ! Will verify Pro and msfconsole cases momentarily.

lib/msf/core/auxiliary/udp_scanner.rb

@@ -21,6 +21,7 @@ module Auxiliary::UDPScanner
 
     register_options(
     [
+      Opt::RPORT,
       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)

modules/auxiliary/scanner/discovery/udp_sweep.rb

@@ -25,6 +25,12 @@ class Metasploit3 < Msf::Auxiliary
       OptBool.new('RANDOMIZE_PORTS', [false, 'Randomize the order the ports are probed', true])
     ], self.class)
 
+    # RPORT is required by UDPScanner but not used in this module since it
+    # works with multiple ports.
+    # TODO: update this module to simply use Scanner or update UDPScanner to support
+    # multiple ports.
+    deregister_options('RPORT')
+
     # Intialize the probes array
     @probes = []