From 363982d0e79322a7b7ce521f26ace437f7c71fda Mon Sep 17 00:00:00 2001 From: "Steve Chew (stechew)" Date: Thu, 5 Mar 2020 16:34:27 +0000 Subject: [PATCH] Merge pull request #2015 in SNORT/snort3 from ~STECHEW/snort3:defer_whitelist to master Squashed commit of the following: commit 0f77d6e97b51eaf3aef757874f36c2ebf612c3fe Author: Steve Chew Date: Wed Feb 5 17:49:46 2020 -0500 flow: turn off deferred whitelist on DONE if no whitelist was seen. --- src/flow/flow.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/flow/flow.h b/src/flow/flow.h index 662275868..696a5de47 100644 --- 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() -- 2.47.3