Merge pull request #992 in SNORT/snort3 from rm_peg_count_assert to master

Squashed commit of the following:

commit 2d9ac5528e31a1cf146d22c6b8f42cbedcfd440a
Author: Steven Baigal <sbaigal@cisco.com>
Date:   Tue Aug 15 18:46:59 2017 -0400

    changed concurrent_sessions stats assert() to if()

diff --git a/src/service_inspectors/dns/dns.cc b/src/service_inspectors/dns/dns.cc
index 2bd1ccea6742e941ddd2410917f59250b50da0c5..b283c70bfbef364552cd49165ca14f010cf0ab2e 100644 (file)
--- a/src/service_inspectors/dns/dns.cc
+++ b/src/service_inspectors/dns/dns.cc
@@ -73,8 +73,8 @@ DnsFlowData::DnsFlowData() : FlowData(inspector_id)
 
 DnsFlowData::~DnsFlowData()
 {
-    assert(dnsstats.concurrent_sessions > 0);
-    dnsstats.concurrent_sessions--;
+    if (dnsstats.concurrent_sessions > 0)
+        dnsstats.concurrent_sessions--;
 }
 
 static DNSData* SetNewDNSData(Packet* p)

diff --git a/src/service_inspectors/gtp/gtp_inspect.cc b/src/service_inspectors/gtp/gtp_inspect.cc
index 3f3f9e96ce54b365ec2638cc86c4051da013920d..ea8c89b60189275424ba6b7f10159bfdf37f6699 100644 (file)
--- a/src/service_inspectors/gtp/gtp_inspect.cc
+++ b/src/service_inspectors/gtp/gtp_inspect.cc
@@ -55,8 +55,8 @@ GtpFlowData::GtpFlowData() : FlowData(inspector_id)
 
 GtpFlowData::~GtpFlowData()
 {
-    assert(gtp_stats.concurrent_sessions > 0);
-    gtp_stats.concurrent_sessions--;
+    if (gtp_stats.concurrent_sessions > 0)
+        gtp_stats.concurrent_sessions--;
 }
 
 //-------------------------------------------------------------------------

diff --git a/src/service_inspectors/imap/imap.cc b/src/service_inspectors/imap/imap.cc
index cfa3e0acf2493d474fd77ad00bb433f51c044f79..dda82f6cfba7cfaf0ccbf2a639ffb842eed321c4 100644 (file)
--- a/src/service_inspectors/imap/imap.cc
+++ b/src/service_inspectors/imap/imap.cc
@@ -152,8 +152,8 @@ ImapFlowData::~ImapFlowData()
     if(session.mime_ssn)
         delete(session.mime_ssn);
 
-    assert(imapstats.concurrent_sessions > 0);
-    imapstats.concurrent_sessions--;
+    if (imapstats.concurrent_sessions > 0)
+        imapstats.concurrent_sessions--;
 }
 
 unsigned ImapFlowData::inspector_id = 0;

diff --git a/src/service_inspectors/modbus/modbus.cc b/src/service_inspectors/modbus/modbus.cc
index d7b0866fcf028679041e2027b08c667fac9c0df4..e9c5cd6eb49f58c635ef516fe0f32d2f9eb27f29 100644 (file)
--- a/src/service_inspectors/modbus/modbus.cc
+++ b/src/service_inspectors/modbus/modbus.cc
@@ -56,8 +56,8 @@ ModbusFlowData::ModbusFlowData() : FlowData(inspector_id)
 
 ModbusFlowData::~ModbusFlowData()
 {
-    assert(modbus_stats.concurrent_sessions > 0);
-    modbus_stats.concurrent_sessions--;
+    if (modbus_stats.concurrent_sessions > 0)
+        modbus_stats.concurrent_sessions--;
 }
 
 //-------------------------------------------------------------------------

diff --git a/src/service_inspectors/pop/pop.cc b/src/service_inspectors/pop/pop.cc
index 10fcbf77353a5aaa8e3bc24a0c96389f25602e76..4f6a332dbe7d9360928e534ad85e871a8f50be87 100644 (file)
--- a/src/service_inspectors/pop/pop.cc
+++ b/src/service_inspectors/pop/pop.cc
@@ -111,8 +111,8 @@ PopFlowData::~PopFlowData()
     if (session.mime_ssn)
         delete(session.mime_ssn);
 
-    assert(popstats.concurrent_sessions > 0);
-    popstats.concurrent_sessions--;
+    if (popstats.concurrent_sessions > 0)
+        popstats.concurrent_sessions--;
 }
 
 unsigned PopFlowData::inspector_id = 0;

diff --git a/src/service_inspectors/sip/sip.cc b/src/service_inspectors/sip/sip.cc
index 4fb734466cc6c95b2893525133bc4272b28e184b..1b000b4aca68e5c8f229d0f6af279c60c802a3f0 100644 (file)
--- a/src/service_inspectors/sip/sip.cc
+++ b/src/service_inspectors/sip/sip.cc
@@ -52,8 +52,8 @@ SipFlowData::SipFlowData() : FlowData(inspector_id)
 SipFlowData::~SipFlowData()
 {
     FreeSipData(&session);
-    assert(sip_stats.concurrent_sessions > 0);
-    sip_stats.concurrent_sessions--;
+    if (sip_stats.concurrent_sessions > 0)
+        sip_stats.concurrent_sessions--;
 }
 
 static SIPData* SetNewSIPData(Packet* p)

diff --git a/src/service_inspectors/smtp/smtp.cc b/src/service_inspectors/smtp/smtp.cc
index e8c788d1af5b6238570f5462489a876703aef44c..4e9c1f6b3095a073a869610f409b4646e13d0967 100644 (file)
--- a/src/service_inspectors/smtp/smtp.cc
+++ b/src/service_inspectors/smtp/smtp.cc
@@ -191,8 +191,8 @@ SmtpFlowData::~SmtpFlowData()
     if ( session.auth_name )
         snort_free(session.auth_name);
 
-    assert(smtpstats.concurrent_sessions > 0);
-    smtpstats.concurrent_sessions--;
+    if (smtpstats.concurrent_sessions > 0)
+        smtpstats.concurrent_sessions--;
 }
 
 unsigned SmtpFlowData::inspector_id = 0;

diff --git a/src/service_inspectors/ssh/ssh.cc b/src/service_inspectors/ssh/ssh.cc
index 52f90a03e5296bd6dab0c0b4020792ebd17df769..3175650e311da13ee7d7ba7c15ece2d3df8da732 100644 (file)
--- a/src/service_inspectors/ssh/ssh.cc
+++ b/src/service_inspectors/ssh/ssh.cc
@@ -61,8 +61,8 @@ SshFlowData::SshFlowData() : FlowData(inspector_id)
 
 SshFlowData::~SshFlowData()
 {
-    assert(sshstats.concurrent_sessions > 0);
-    sshstats.concurrent_sessions--;
+    if (sshstats.concurrent_sessions > 0)
+        sshstats.concurrent_sessions--;
 }
 
 static SSHData* SetNewSSHData(Packet* p)

diff --git a/src/service_inspectors/ssl/ssl_inspector.cc b/src/service_inspectors/ssl/ssl_inspector.cc
index 068d3c3efa30e09d803c2df09972d0f4600619e9..60ef22142a4a2c0d06d084c8d1636a29252d0602 100644 (file)
--- a/src/service_inspectors/ssl/ssl_inspector.cc
+++ b/src/service_inspectors/ssl/ssl_inspector.cc
@@ -80,8 +80,8 @@ SslFlowData::SslFlowData() : FlowData(inspector_id)
 
 SslFlowData::~SslFlowData()
 {
-    assert(sslstats.concurrent_sessions > 0);
-    sslstats.concurrent_sessions--;
+    if (sslstats.concurrent_sessions > 0)
+        sslstats.concurrent_sessions--;
 }
 
 static SSLData* SetNewSSLData(Packet* p)