Merge pull request #1501 in SNORT/snort3 from ~VIROEMER/snort3:ssl_count_disabled...

Squashed commit of the following:

commit feadce72ee24492a12455f0bd2c765554e339d65
Author: Victor Roemer (viroemer) <viroemer@cisco.com>
Date:   Wed Jan 30 14:53:31 2019 -0500

    ssl: Count calls to disable_content for ssl sessions

diff --git a/src/service_inspectors/ssl/ssl_inspector.cc b/src/service_inspectors/ssl/ssl_inspector.cc
index 535ac8d386394e8a13d30b1b4543e1c314a88a0c..33bb8ff4908e0d4ff6bb97ba2592f66931631880 100644 (file)
--- a/src/service_inspectors/ssl/ssl_inspector.cc
+++ b/src/service_inspectors/ssl/ssl_inspector.cc
@@ -192,6 +192,7 @@ static inline uint32_t SSLPP_process_alert(
         !(new_flags & SSL_HEARTBEAT_SEEN))
     {
         DetectionEngine::disable_content(packet);
+        sslstats.disabled++;
     }
 
     /* Need to negate the application flags from the opposing side. */
@@ -238,6 +239,7 @@ static inline uint32_t SSLPP_process_app(SSL_PROTO_CONF* config, uint32_t ssn_fl
         else if (!(new_flags & SSL_HEARTBEAT_SEEN))
         {
             DetectionEngine::disable_content(packet);
+            sslstats.disabled++;
         }
     }
 
@@ -264,6 +266,7 @@ static inline void SSLPP_process_other(SSL_PROTO_CONF* config, SSLData* sd, uint
         else if (!(new_flags & SSL_HEARTBEAT_SEEN))
         {
             DetectionEngine::disable_content(packet);
+            sslstats.disabled++;
         }
     }
     else
@@ -345,6 +348,7 @@ static void snort_ssl(SSL_PROTO_CONF* config, Packet* p)
         if (!(new_flags & SSL_HEARTBEAT_SEEN))
         {
             DetectionEngine::disable_content(p);
+            sslstats.disabled++;
         }
 
         sd->ssn_flags |= new_flags;