Merge pull request #2492 in SNORT/snort3 from ~KBHANDAN/snort3:whd to master

Squashed commit of the following:

commit 7cebab7b8118ab1539a7b1845f2d4b53ad2b74e8
Author: Kaushal Bhandankar <kbhandan@cisco.com>
Date:   Sun Sep 20 18:36:46 2020 -0400

    flow: stale and deleted flows due to EOF should generate would have dropped event

diff --git a/src/flow/flow_control.cc b/src/flow/flow_control.cc
index 5d25aa03d07204d01f74c5cc09658a3f0705f12c..9157b03f42ecfb8dceb6bd189d0795f530fd5be0 100644 (file)
--- a/src/flow/flow_control.cc
+++ b/src/flow/flow_control.cc
@@ -139,6 +139,8 @@ Flow* FlowControl::stale_flow_cleanup(FlowCache* cache, Flow* flow, Packet* p)
 {
     if ( p->pkth->flags & DAQ_PKT_FLAG_NEW_FLOW )
     {
+        ActiveSuspendContext act_susp(Active::ASP_TIMEOUT);
+
         if (PacketTracer::is_active())
             PacketTracer::log("Session: deleting snort session, reason: stale and not cleaned \n");
 

diff --git a/src/packet_io/active.h b/src/packet_io/active.h
index 69e6c2f30ab0bfa641daf8f89cead75afa9be345..20cd1faccd6348e4a5f7e412a2bfa0065af02877 100644 (file)
--- a/src/packet_io/active.h
+++ b/src/packet_io/active.h
@@ -229,7 +229,7 @@ private:
     ActiveAction* delayed_reject;    // set with set_delayed_action()
 };
 
-struct ActiveSuspendContext
+struct SO_PUBLIC ActiveSuspendContext
 {
     ActiveSuspendContext(Active::ActiveSuspendReason suspend_reason)
     { Active::suspend(suspend_reason); }