From: Bhargava Jandhyala (bjandhya) <bjandhya@cisco.com>
Date: Wed, 19 Aug 2020 07:15:12 +0000 (+0000)
Subject: Merge pull request #2408 in SNORT/snort3 from ~KBHANDAN/snort3:whd_reload to master
X-Git-Tag: 3.0.2-6~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f17710530e1de2d1428cd080f503dcbabd7a1a5;p=thirdparty%2Fsnort3.git

Merge pull request #2408 in SNORT/snort3 from ~KBHANDAN/snort3:whd_reload to master

Squashed commit of the following:

commit ffbbe26f3beb7a46b5bd3b9f2b28d3a2b8092a7a
Author: Kaushal Bhandankar <kbhandan@cisco.com>
Date:   Tue Aug 18 08:56:11 2020 -0400

    flow: reset the flow before removing
---

diff --git a/src/flow/flow_cache.cc b/src/flow/flow_cache.cc
index aeadfd621..ee29e4335 100644
--- a/src/flow/flow_cache.cc
+++ b/src/flow/flow_cache.cc
@@ -375,7 +375,6 @@ unsigned FlowCache::delete_active_flows(unsigned mode, unsigned num_to_delete, u
         }
 
         // we have a winner...
-        hash_table->remove();
         if ( flow->next )
             unlink_uni(flow);
 
@@ -386,6 +385,9 @@ unsigned FlowCache::delete_active_flows(unsigned mode, unsigned num_to_delete, u
         else
             delete_stats.update(FlowDeleteState::ALLOWED);
 
+        flow->reset(true);
+        //The flow should not be removed from the hash before reset
+        hash_table->remove();
         delete flow;
         memory::MemoryCap::update_deallocations(sizeof(HashNode) + sizeof(FlowKey));
         --flows_allocated;