Merge pull request #2015 in SNORT/snort3 from ~STECHEW/snort3:defer_whitelist to...

Squashed commit of the following:

commit 0f77d6e97b51eaf3aef757874f36c2ebf612c3fe
Author: Steve Chew <stechew@cisco.com>
Date:   Wed Feb 5 17:49:46 2020 -0500

    flow: turn off deferred whitelist on DONE if no whitelist was seen.

diff --git a/src/flow/flow.h b/src/flow/flow.h
index 662275868e32fc81bb33756e3da746a2e41e58da..696a5de47598de0611bed972c76956047b58de3c 100644 (file)
--- a/src/flow/flow.h
+++ b/src/flow/flow.h
@@ -372,7 +372,15 @@ public:
 
     void set_deferred_whitelist(DeferredWhitelist defer_state)
     {
-        deferred_whitelist = defer_state;
+        if (defer_state == WHITELIST_DEFER_DONE )
+        {
+            if (deferred_whitelist == WHITELIST_DEFER_STARTED )
+                deferred_whitelist = WHITELIST_DEFER_DONE;
+            else
+                deferred_whitelist = WHITELIST_DEFER_OFF;
+        }
+        else
+            deferred_whitelist = defer_state;
     }
 
     DeferredWhitelist get_deferred_whitelist_state()