Remove arg for bind port/addr functions

Done to avoid masking of datastore instance variable.

Author: OJ

lib/msf/core/handler/reverse_http.rb

@@ -83,8 +83,8 @@ def ssl?
   # addresses.
   #
   def full_uri
-    addrs = bind_address(datastore)
-    local_port = bind_port(datastore)
+    addrs = bind_address
+    local_port = bind_port
     scheme = (ssl?) ? "https" : "http"
     "#{scheme}://#{addrs[0]}:#{local_port}/"
   end
@@ -174,8 +174,8 @@ def setup_handler
       comm = nil
     end
 
-    local_port = bind_port(datastore)
-    addrs = bind_address(datastore)
+    local_port = bind_port
+    addrs = bind_address
 
     # Start the HTTPS server service on this host/port
     self.service = Rex::ServiceManager.start(Rex::Proto::Http::Server,
@@ -399,12 +399,12 @@ def on_request(cli, req, obj)
 
 protected
 
-  def bind_port(datastore)
+  def bind_port
     port = datastore['ReverseListenerBindPort'].to_i
     port > 0 ? port : datastore['LPORT'].to_i
   end
 
-  def bind_address(datastore)
+  def bind_address
     # Switch to IPv6 ANY address if the LHOST is also IPv6
     addr = Rex::Socket.resolv_nbo(datastore['LHOST'])
     # First attempt to bind LHOST. If that fails, the user probably has

lib/msf/core/handler/reverse_tcp.rb

@@ -81,8 +81,8 @@ def setup_handler
       comm = nil
     end
 
-    local_port = bind_port(datastore)
-    addrs = bind_address(datastore)
+    local_port = bind_port
+    addrs = bind_address
 
     addrs.each { |ip|
       begin
@@ -130,7 +130,7 @@ def cleanup_handler
   # Starts monitoring for an inbound connection.
   #
   def start_handler
-    local_port = bind_port(datastore)
+    local_port = bind_port
     self.listener_thread = framework.threads.spawn("ReverseTcpHandlerListener-#{local_port}", false) {
       client = nil
 
@@ -232,12 +232,12 @@ def stop_handler
 
 protected
 
-  def bind_port(datastore)
+  def bind_port
     port = datastore['ReverseListenerBindPort'].to_i
     port > 0 ? port : datastore['LPORT'].to_i
   end
 
-  def bind_address(datastore)
+  def bind_address
     # Switch to IPv6 ANY address if the LHOST is also IPv6
     addr = Rex::Socket.resolv_nbo(datastore['LHOST'])
     # First attempt to bind LHOST. If that fails, the user probably has

lib/msf/core/handler/reverse_tcp_ssl.rb

@@ -69,8 +69,8 @@ def setup_handler
       comm = nil
     end
 
-    local_port = bind_port(datastore)
-    addrs = bind_address(datastore)
+    local_port = bind_port
+    addrs = bind_address
 
     addrs.each { |ip|
       begin
@@ -111,12 +111,12 @@ def setup_handler
 
 protected
 
-  def bind_port(datastore)
+  def bind_port
     port = datastore['ReverseListenerBindPort'].to_i
     port > 0 ? port : datastore['LPORT'].to_i
   end
 
-  def bind_address(datastore)
+  def bind_address
     # Switch to IPv6 ANY address if the LHOST is also IPv6
     addr = Rex::Socket.resolv_nbo(datastore['LHOST'])
     # First attempt to bind LHOST. If that fails, the user probably has