Addes Statistics support from the API. When typing status in a hardware bridge it will also print packet statistics.

Signed-off-by: Craig Smith <[email protected]>

Author: zombieCraig

lib/rex/post/hwbridge/client.rb

@@ -63,6 +63,13 @@ def get_status
     send_request("/status")
   end
 
+  #
+  # Gets the devices statistics
+  #
+  def get_statistics
+    send_request("/statistics")
+  end
+
   #
   # Fetches custom methods from HW, if any
   #

lib/rex/post/hwbridge/ui/console/command_dispatcher/core.rb

@@ -161,7 +161,7 @@ def cmd_info_tabs(*args)
   def cmd_status_help
     print_line("Usage: status")
     print_line
-    print_line "Retrives the devices current status and capabilities"
+    print_line "Retrives the devices current status and statistics"
   end
 
   #
@@ -173,15 +173,20 @@ def cmd_status(*args)
       return true
     end
     status = client.get_status
+    stats = client.get_statistics
     if status.has_key? 'operational'
       op = 'Unknown'
       op = 'Yes' if status['operational'] == 1
       op = 'No' if status['operational'] == 2
       print_status("Operational: #{op}")
     end
-    print_status("Device: #{status['device_name']}") if status.has_key? 'device_name'
-    print_status("FW Version: #{status['fw_version']}") if status.has_key? 'fw_version'
-    print_status("HW Version: #{status['hw_version']}") if status.has_key? 'hw_version'
+    print_status("Device: #{status['device_name']}") if status.key? 'device_name'
+    print_status("FW Version: #{status['fw_version']}") if status.key? 'fw_version'
+    print_status("HW Version: #{status['hw_version']}") if status.key? 'hw_version'
+    print_status("Uptime: #{stats["uptime"]} seconds") if stats.key? "uptime"
+    print_status("Packets Sent: #{stats["packet_stats"]}") if stats.key? "packet_stats"
+    print_status("Last packet Sent: #{Time.at(stats["last_request"])}") if stats.key? "last_request"
+    print_status("Voltage: #{stats["voltage"]}") if stats.key? "voltage" and not stats["voltage"] == "not supported"
   end
 
   def cmd_specialty_help

modules/auxiliary/server/local_hwbridge.rb

@@ -41,6 +41,8 @@ def initialize(info = {})
     @server_started = Time.new
     @can_interfaces = []
     @pkt_response = {}  # Candump returned packets
+    @packets_sent = 0
+    @last_sent = nil
   end
 
   def detect_can
@@ -72,8 +74,8 @@ def get_status
   def get_statistics
     stats = {}
     stats["uptime"] = Time.now - @server_started
-    stats["packet_stats"] = "not supported"
-    stats["last_request"] = "not supported"
+    stats["packet_stats"] = @packets_sent
+    stats["last_request"] = @last_sent if @last_sent
     stats["voltage"] = "not supported"
     stats
   end
@@ -134,6 +136,8 @@ def cansend(bus, id, data)
     @can_interfaces.each do |can|
       if can == bus
         system("cansend #{bus} #{id}##{bytes.join}")
+        @packets_sent += 1
+        @last_sent = Time.now.to_i
         result["Success"] = true if $?.success?
       end
     end
@@ -194,6 +198,8 @@ def isotp_send_and_wait(bus, srcid, dstid, data, timeout = 2000, maxpkts = 3)
       if can == bus
         candump(bus, dstid, timeout, maxpkts)
         system("cansend #{bus} #{srcid}##{bytes}")
+        @packets_sent += 1
+        @last_sent = Time.now.to_i
         result["Success"] = true if $?.success?
         result["Packets"] = []
         $candump_sniffer.join