From: Luke Coughlan <lcoughlan5@gmail.com>
Date: Mon, 26 Apr 2021 12:05:15 +0000 (+0100)
Subject: flow/bypass: Properly set the ICMP emergency-bypassed value
X-Git-Tag: suricata-6.0.3~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f53e0bb2f46d9b54185b2aa7de0311b6103a63c;p=thirdparty%2Fsuricata.git

flow/bypass: Properly set the ICMP emergency-bypassed value

Currently the ICMP emergency-bypassed value defined in suricata.conf is
overwriting the UDP value rather than correctly setting it for ICMP.
This commit corrects this bug so that the ICMP value can be set as
expected.

(cherry picked from commit 7fb56a9075a97cd9781d08efd0f949b0bfca2719)
---

diff --git a/src/flow.c b/src/flow.c
index 614540dd53..8e36125188 100644
--- a/src/flow.c
+++ b/src/flow.c
@@ -978,7 +978,7 @@ void FlowInitFlowProto(void)
                                             strlen(emergency_bypassed),
                                             emergency_bypassed) > 0) {
 
-                flow_timeouts_emerg[FLOW_PROTO_UDP].bypassed_timeout = configval;
+                flow_timeouts_emerg[FLOW_PROTO_ICMP].bypassed_timeout = configval;
             }
         }
     }