Merge pull request #94 in SNORT/snort3 from crc/ms to master

Squashed commit of the following:

commit 42a8be5b72ebcadfa8770eb72d9a324b46b8a602
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Oct 22 12:33:53 2015 -0400

    remove superfluous comma

commit fb07ddf4e09de435c58dd62bfdac5e723f975ace
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Oct 22 12:30:45 2015 -0400

    update modbus stats

diff --git a/src/service_inspectors/modbus/modbus.cc b/src/service_inspectors/modbus/modbus.cc
index d25ee714e304cba14f22d70c4198db6ee319f1d6..75266a33f1f7d54dd2486652681db7c5c6a215f4 100644 (file)
--- a/src/service_inspectors/modbus/modbus.cc
+++ b/src/service_inspectors/modbus/modbus.cc
@@ -93,6 +93,7 @@ void Modbus::eval(Packet* p)
     {
         mfd = new ModbusFlowData;
         p->flow->set_application_data(mfd);
+        modbus_stats.sessions++;
     }
 
     // When pipelined Modbus PDUs appear in a single TCP segment, the

diff --git a/src/service_inspectors/modbus/modbus.h b/src/service_inspectors/modbus/modbus.h
index 673d5e998619bd6de7997936666963de249bb5c0..bd566dda3ebde1fa1150497b90cd5cd81756c320 100644 (file)
--- a/src/service_inspectors/modbus/modbus.h
+++ b/src/service_inspectors/modbus/modbus.h
@@ -29,6 +29,7 @@
 struct ModbusStats
 {
     PegCount sessions;
+    PegCount frames;
 };
 
 struct modbus_session_data_t

diff --git a/src/service_inspectors/modbus/modbus_module.cc b/src/service_inspectors/modbus/modbus_module.cc
index a0009d485644932420e7f57fff2777a538cc6604..e9371daa1e2436dfc7df542442413ce5c2a52418 100644 (file)
--- a/src/service_inspectors/modbus/modbus_module.cc
+++ b/src/service_inspectors/modbus/modbus_module.cc
@@ -32,6 +32,7 @@ THREAD_LOCAL ProfileStats modbus_prof;
 const PegInfo peg_names[] =
 {
     { "sessions", "total sessions processed" },
+    { "frames", "total Modbus messages" },
 
     { nullptr, nullptr }
 };

diff --git a/src/service_inspectors/modbus/modbus_paf.cc b/src/service_inspectors/modbus/modbus_paf.cc
index 0b735b4a279df09375672006c8245dc7db013d14..e324c7ec27edfd505f4a6cae4a1f39d30b0ae6dc 100644 (file)
--- a/src/service_inspectors/modbus/modbus_paf.cc
+++ b/src/service_inspectors/modbus/modbus_paf.cc
@@ -79,6 +79,7 @@ StreamSplitter::Status ModbusSplitter::scan(
             *fp = modbus_length + bytes_processed;
             state = MODBUS_PAF_STATE__TRANS_ID_1;
             modbus_length = 0;
+            modbus_stats.frames++;
             return StreamSplitter::FLUSH;
         }
 

diff --git a/src/service_inspectors/service_inspectors.cc b/src/service_inspectors/service_inspectors.cc
index 4e2afc37e3379dc9a37ffce75be8ed366fb52f08..59071f832541426d1ca8b832b2b02054458dfad3 100644 (file)
--- a/src/service_inspectors/service_inspectors.cc
+++ b/src/service_inspectors/service_inspectors.cc
@@ -40,6 +40,7 @@ extern const BaseApi* ips_sip_method;
 extern const BaseApi* ips_sip_stat_code;
 extern const BaseApi* ips_ssl_state;
 extern const BaseApi* ips_ssl_version;
+
 extern const BaseApi* sin_bo;
 extern const BaseApi* sin_dns;
 extern const BaseApi* sin_ftp_client;
@@ -77,6 +78,7 @@ const BaseApi* service_inspectors[] =
     ips_sip_stat_code,
     ips_ssl_state,
     ips_ssl_version,
+
     sin_bo,
     sin_dns,
     sin_ftp_client,
@@ -95,6 +97,6 @@ const BaseApi* service_inspectors[] =
     sin_telnet,
     sin_wizard,
 #endif
-    nullptr,
+    nullptr
 };