Merge branch 'hwbridge' of https://github.com/OpenGarages/metasploit-framework into hwbridge

Author: zombieCraig

documentation/modules/auxiliary/client/hwbridge/connect.md

@@ -20,6 +20,8 @@ how to extend your project to integrate it with Metasploit.  If you are building
 and you are using the [Carloop](https://carloop.io) then the spark-msf-relay library also includes an example app for carloop
 that you can simply flash to the device for full support.
 
+2. Generic ELM327: [ebay](http://www.ebay.com/itm/like/221821719820)
+
 ## Bluetooth Adapter Connection
 
 Bluetooth HWBridge adapters, depending on the Operating System, may take several additional steps to establish a connection and communications bus.

tools/hardware/elm327_relay.rb

@@ -70,6 +70,10 @@ class ELM327Relay < Msf::Auxiliary
     #  @return [Integer] Stop bit
     attr_accessor :serial_stop_bits
 
+    # @!attribute server_port
+    #  @return [Integer] HTTP Relay server port
+    attr_accessor :server_port
+
     def initialize(info={})
       # Set some defaults
       self.serial_port = "/dev/ttyUSB0"
@@ -81,6 +85,12 @@ def initialize(info={})
         exit
       end
 
+      if @opts.has_key? :server_port
+        self.server_port = @opts[:server_port]
+      else
+        self.server_port = 8080
+      end
+
     super(update_info(info,
       'Name'        => 'ELM327/STN1100 HWBridge Relay Server',
       'Description' => %q{
@@ -100,6 +110,7 @@ def initialize(info={})
       'DefaultAction'  => 'WebServer',
         'DefaultOptions' =>
          {
+            'SRVPORT' => self.server_port,
             'URIPATH' => "/" 
           }))
        self.serial_port = @opts[:serial] if @opts.has_key? :serial
@@ -369,6 +380,11 @@ def self.get_parsed_options
           options[:serial] = v
         end
 
+        opt.on('-p', '--port <server_port>',
+          "(Optional) Sets the listening HTTP server port (Default=8080)") do |v|
+          options[:server_port] = v
+        end
+
         opt.on_tail('-h', '--help', 'Show this message') do
           $stdout.puts opt
           exit