Merge pull request #532 in SNORT/snort3 from appid_ws2_plugins4 to master

Squashed commit of the following:

commit f4a3688aba9dbf3adf39b0adcd64ea9753260aca
Author: Steve Chew <stechew@cisco.com>
Date:   Fri Jun 17 15:49:17 2016 -0400

    Added SSL count. Updated count variable names.

diff --git a/src/network_inspectors/appid/appid_inspector.cc b/src/network_inspectors/appid/appid_inspector.cc
index 4cb81b7b4572549909c2291bce05739520678f4c..1543f181cde9b0619614230adb74a645a19b09ee 100644 (file)
--- a/src/network_inspectors/appid/appid_inspector.cc
+++ b/src/network_inspectors/appid/appid_inspector.cc
@@ -80,7 +80,7 @@ void AppIdInspector::eval(Packet* pkt)
 {
     Profile profile(appidPerfStats);
 
-    appid_stats.packet_count++;
+    appid_stats.packets++;
     fwAppIdSearch(pkt);
 }
 

diff --git a/src/network_inspectors/appid/appid_module.cc b/src/network_inspectors/appid/appid_module.cc
index cb04797ebd7a91da6cb1e17629d985ab69ff03e4..08c21fc085a5d5156589ab408a002ae8688dd804 100644 (file)
--- a/src/network_inspectors/appid/appid_module.cc
+++ b/src/network_inspectors/appid/appid_module.cc
@@ -36,14 +36,15 @@ THREAD_LOCAL ProfileStats appidPerfStats;
 // FIXIT-M: define and implement a flexible solution for maintaining protocol specific stats
 const PegInfo appid_pegs[] =
 {
-    { "packet_count", "count of packets processed by appid" },
-    { "dns_udp_count", "count of dns flows over udp discovered by appid" },
-    { "dns_tcp_count", "count of dns flows over tcp discovered by appid" },
-    { "ftp_count", "count of ftp flows discovered by appid" },
-    { "ftps_count", "count of ftps flows discovered by appid" },
-    { "smtp_count", "count of smtp flows discovered by appid" },
-    { "smtps_count", "count of smtps flows discovered by appid" },
-    { "telnet_count", "count of telnet flows discovered by appid" },
+    { "packets", "count of packets processed by appid" },
+    { "dns_udp_flows", "count of dns flows over udp discovered by appid" },
+    { "dns_tcp_flows", "count of dns flows over tcp discovered by appid" },
+    { "ftp_flows", "count of ftp flows discovered by appid" },
+    { "ftps_flows", "count of ftps flows discovered by appid" },
+    { "smtp_flows", "count of smtp flows discovered by appid" },
+    { "smtps_flows", "count of smtps flows discovered by appid" },
+    { "ssl_flows", "count of ssl flows discovered by appid" },
+    { "telnet_flows", "count of telnet flows discovered by appid" },
     { nullptr, nullptr }
 };
 

diff --git a/src/network_inspectors/appid/appid_module.h b/src/network_inspectors/appid/appid_module.h
index dc4ffbb39b3601cf63cf374a3f37703263bd02e4..0f332497f5dc6e3fd7bf20290b8a716bd09d6a03 100644 (file)
--- a/src/network_inspectors/appid/appid_module.h
+++ b/src/network_inspectors/appid/appid_module.h
@@ -37,14 +37,15 @@ extern THREAD_LOCAL ProfileStats appidPerfStats;
 
 struct AppIdStats
 {
-    PegCount packet_count;
-    PegCount dns_udp_count;
-    PegCount dns_tcp_count;
-    PegCount ftp_count;
-    PegCount ftps_count;
-    PegCount smtp_count;
-    PegCount smtps_count;
-    PegCount telnet_count;
+    PegCount packets;
+    PegCount dns_udp_flows;
+    PegCount dns_tcp_flows;
+    PegCount ftp_flows;
+    PegCount ftps_flows;
+    PegCount smtp_flows;
+    PegCount smtps_flows;
+    PegCount ssl_flows;
+    PegCount telnet_flows;
 };
 
 extern THREAD_LOCAL AppIdStats appid_stats;

diff --git a/src/network_inspectors/appid/detector_plugins/detector_dns.cc b/src/network_inspectors/appid/detector_plugins/detector_dns.cc
index 5a748cd17c75c268168f98dd8dfac8167887d7e8..26ba9e46587d660f36310459c700bbd4b089f73c 100644 (file)
--- a/src/network_inspectors/appid/detector_plugins/detector_dns.cc
+++ b/src/network_inspectors/appid/detector_plugins/detector_dns.cc
@@ -559,7 +559,7 @@ success:
         setAppIdFlag(flowp, APPID_SESSION_CONTINUE);
         dns_service_mod.api->add_service(flowp, args->pkt, dir, &udp_svc_element,
             APP_ID_DNS, nullptr, nullptr, nullptr);
-        appid_stats.dns_udp_count++;
+        appid_stats.dns_udp_flows++;
         return SERVICE_SUCCESS;
     case SERVICE_INVALID_CLIENT:
 invalid:
@@ -665,7 +665,7 @@ success:
     setAppIdFlag(flowp, APPID_SESSION_CONTINUE);
     dns_service_mod.api->add_service(flowp, args->pkt, dir, &tcp_svc_element,
         APP_ID_DNS, nullptr, nullptr, nullptr);
-    appid_stats.dns_tcp_count++;
+    appid_stats.dns_tcp_flows++;
     return SERVICE_SUCCESS;
 
 not_compatible:

diff --git a/src/network_inspectors/appid/service_plugins/service_base.cc b/src/network_inspectors/appid/service_plugins/service_base.cc
index c8edc5095f9d4cbc79d2447ae2274b85cc5d92d4..792199f0c6f0f6ed32b74fc09dfe87d4e749e6a2 100644 (file)
--- a/src/network_inspectors/appid/service_plugins/service_base.cc
+++ b/src/network_inspectors/appid/service_plugins/service_base.cc
@@ -198,8 +198,8 @@ static RNAServiceValidationModule* static_service_list[] =
 #ifdef REMOVED_WHILE_NOT_IN_USE
     &snmp_service_mod,
     &ssh_service_mod,
-    &ssl_service_mod,
 #endif
+    &ssl_service_mod,
     &telnet_service_mod,
 #ifdef REMOVED_WHILE_NOT_IN_USE
     &tftp_service_mod,

diff --git a/src/network_inspectors/appid/service_plugins/service_ftp.cc b/src/network_inspectors/appid/service_plugins/service_ftp.cc
index b0859b4dc0db99966681d41156cf6d7bca4e4a1e..d3b2b161992b008c0d3b8bbc197954c2b4a4dd70 100644 (file)
--- a/src/network_inspectors/appid/service_plugins/service_ftp.cc
+++ b/src/network_inspectors/appid/service_plugins/service_ftp.cc
@@ -1306,9 +1306,9 @@ inprocess:
                 fd->version[0] ? fd->version : nullptr, nullptr);
 
             if(encryptedFlag == APPID_SESSION_ENCRYPTED)
-                appid_stats.ftps_count++;
+                appid_stats.ftps_flows++;
             else
-                appid_stats.ftp_count++;
+                appid_stats.ftp_flows++;
         }
         return SERVICE_SUCCESS;
 

diff --git a/src/network_inspectors/appid/service_plugins/service_smtp.cc b/src/network_inspectors/appid/service_plugins/service_smtp.cc
index b916063782d802be6baf5a44fc1d2ff9a1fadd57..d860d9604bbd38f8290b52e3fe1373d041e2a644 100644 (file)
--- a/src/network_inspectors/appid/service_plugins/service_smtp.cc
+++ b/src/network_inspectors/appid/service_plugins/service_smtp.cc
@@ -336,9 +336,9 @@ success:
         fd->state == SMTP_STATE_STARTTLS ? APP_ID_SMTPS : APP_ID_SMTP,
         nullptr, nullptr, nullptr);
     if (fd->state == SMTP_STATE_STARTTLS)
-        appid_stats.smtps_count++;
+        appid_stats.smtps_flows++;
     else
-        appid_stats.smtp_count++;
+        appid_stats.smtp_flows++;
 
     return SERVICE_SUCCESS;
 

diff --git a/src/network_inspectors/appid/service_plugins/service_ssl.cc b/src/network_inspectors/appid/service_plugins/service_ssl.cc
index d97a855320a127008f27e10587474b6f39b224d4..347a21a9f73150cae2622974a275f560bd539183 100644 (file)
--- a/src/network_inspectors/appid/service_plugins/service_ssl.cc
+++ b/src/network_inspectors/appid/service_plugins/service_ssl.cc
@@ -32,6 +32,7 @@
 #include "service_base.h"
 #include "service_ssl.h"
 #include "fw_appid.h"
+#include "appid_module.h"
 
 #include "main/snort_debug.h"
 #include "utils/util.h"
@@ -934,6 +935,7 @@ success:
     }
     ssl_service_mod.api->add_service(flowp, args->pkt, dir, &svc_element,
         getSslServiceAppId(args->pkt->ptrs.sp), nullptr, nullptr, nullptr);
+    appid_stats.ssl_flows++;
     return SERVICE_SUCCESS;
 }
 

diff --git a/src/network_inspectors/appid/service_plugins/service_telnet.cc b/src/network_inspectors/appid/service_plugins/service_telnet.cc
index fe50ca14850f4c786f58107c1771034518fd9175..d54754aa6b2b3cc03ed9222e6cd9144296742f8f 100644 (file)
--- a/src/network_inspectors/appid/service_plugins/service_telnet.cc
+++ b/src/network_inspectors/appid/service_plugins/service_telnet.cc
@@ -176,7 +176,7 @@ inprocess:
 success:
     telnet_service_mod.api->add_service(flowp, args->pkt, args->dir, &svc_element,
         APP_ID_TELNET, nullptr, nullptr, nullptr);
-    appid_stats.telnet_count++;
+    appid_stats.telnet_flows++;
     return SERVICE_SUCCESS;
 
 fail: