Cleanup proxyhost/proxyport arguments to match new names

Author: HD Moore

lib/msf/core/handler/reverse_hop_http.rb

@@ -256,8 +256,8 @@ def send_new_stage
       :expiration     => datastore['SessionExpirationTimeout'],
       :comm_timeout   => datastore['SessionCommunicationTimeout'],
       :ua             => datastore['MeterpreterUserAgent'],
-      :proxyhost      => datastore['PayloadProxyHost'],
-      :proxyport      => datastore['PayloadProxyPort'],
+      :proxy_host     => datastore['PayloadProxyHost'],
+      :proxy_port     => datastore['PayloadProxyPort'],
       :proxy_type     => datastore['PayloadProxyType'],
       :proxy_username => datastore['PayloadProxyUser'],
       :proxy_password => datastore['PayloadProxyPass']

lib/msf/core/handler/reverse_http.rb

@@ -299,8 +299,8 @@ def on_request(cli, req, obj)
           :expiration     => datastore['SessionExpirationTimeout'],
           :comm_timeout   => datastore['SessionCommunicationTimeout'],
           :ua             => datastore['MeterpreterUserAgent'],
-          :proxyhost      => datastore['PayloadProxyHost'],
-          :proxyport      => datastore['PayloadProxyPort'],
+          :proxy_host     => datastore['PayloadProxyHost'],
+          :proxy_port     => datastore['PayloadProxyPort'],
           :proxy_type     => datastore['PayloadProxyType'],
           :proxy_username => datastore['PayloadProxyUser'],
           :proxy_password => datastore['PayloadProxyPass']

lib/rex/payloads/meterpreter/patch.rb

@@ -118,8 +118,8 @@ def self.patch_passive_service! blob, options
           patch_comm_timeout! blob, options[:comm_timeout]
           patch_ua! blob, options[:ua]
           patch_proxy!(blob,
-            options[:proxyhost],
-            options[:proxyport],
+            options[:proxy_host],
+            options[:proxy_port],
             options[:proxy_type]
           )
           patch_proxy_auth!(blob,