Merge pull request #1623 in SNORT/snort3 from ~VIGNVISW/snort3:vignvisw_eof to master

Squashed commit of the following:

commit af18eb5c0005d65a1c4879d74dbfa80f736e81b8
Author: Vigneshwari Viswanathan <vignvisw@cisco.com>
Date:   Fri May 17 07:01:05 2019 -0400

    stream: add convenient method for flow deletion

diff --git a/src/stream/stream.cc b/src/stream/stream.cc
index 3ca0d7234f9b1ce971a9e1d7bdd11a687bc4987f..405b941f589d312a618e1873c433dc6a2d767c74 100644 (file)
--- a/src/stream/stream.cc
+++ b/src/stream/stream.cc
@@ -76,6 +76,11 @@ Flow* Stream::new_flow(const FlowKey* key)
 void Stream::delete_flow(const FlowKey* key)
 { flow_con->delete_flow(key); }
 
+void Stream::delete_flow(Flow* flow)
+{
+    flow_con->delete_flow(flow, PruneReason::NONE);
+}
+
 //-------------------------------------------------------------------------
 // key foo
 //-------------------------------------------------------------------------

diff --git a/src/stream/stream.h b/src/stream/stream.h
index be66d1794cf3d9fb27fa98ccc7c5909c9e452011..4168f4d18b3caf4ed54e36e79b82cb2579b98fee 100644 (file)
--- a/src/stream/stream.h
+++ b/src/stream/stream.h
@@ -90,6 +90,7 @@ public:
     // Removes the flow session object from the flow cache table and returns
     // the resources allocated to that flow to the free list.
     static void delete_flow(const FlowKey*);
+    static void delete_flow(Flow*);
 
     // Examines the source and destination ip addresses and ports to determine if the
     // packet is from the client or server side of the flow and sets bits in the