Move to build_probe

Author: jhart-r7

lib/msf/core/auxiliary/udp_scanner.rb

@@ -13,9 +13,6 @@ module Auxiliary::UDPScanner
   # A hash of results of a given batch run, keyed by host
   attr_accessor :results
 
-  # A probe to be sent to each host
-  attr_accessor :probe
-
   #
   # Initializes an instance of an auxiliary module that scans UDP
   #
@@ -174,9 +171,13 @@ def rport
   # The including module may override some of 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.
   def scan_host(ip)
-    scanner_send(@probe, ip, rport)
+    scanner_send(build_probe, ip, rport)
   end
 
   # Called for each response packet

modules/auxiliary/scanner/udp_scanner_template.rb

@@ -48,9 +48,11 @@ def setup
     super
     # TODO: do any sort of preliminary sanity checking, like perhaps validating some options
     # in the datastore, etc.
+  end
 
-    # TODO: build the appropriate probe here
-    @probe = 'abracadabra!'
+  # TODO: construct the appropriate probe here.
+  def build_probe
+    @probe ||= 'abracadabra!'
   end
 
   # TODO: this is called before the scan block for each batch of hosts.  Do any