From: Masud Hasan (mashasan) <mashasan@cisco.com>
Date: Thu, 16 Sep 2021 00:07:58 +0000 (+0000)
Subject: Merge pull request #3057 in SNORT/snort3 from ~SMINUT/snort3:tcp_session_timeout... 
X-Git-Tag: 3.1.13.0~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20f9512054097bc12071e2c5fa48b1eed2dc48a0;p=thirdparty%2Fsnort3.git

Merge pull request #3057 in SNORT/snort3 from ~SMINUT/snort3:tcp_session_timeout to master

Squashed commit of the following:

commit c4a246fa22f060d6201b8ec2427d864a1de7ab0c
Author: Silviu Minut <sminut@cisco.com>
Date:   Mon Sep 13 13:10:26 2021 -0400

    stream: change session_timeout default for tcp, ip, icmp and user
---

diff --git a/src/stream/icmp/icmp_module.cc b/src/stream/icmp/icmp_module.cc
index d95067508..f4f9b421b 100644
--- a/src/stream/icmp/icmp_module.cc
+++ b/src/stream/icmp/icmp_module.cc
@@ -35,7 +35,7 @@ using namespace std;
 
 static const Parameter s_params[] =
 {
-    { "session_timeout", Parameter::PT_INT, "1:max31", "30",
+    { "session_timeout", Parameter::PT_INT, "1:max31", "60",
       "session tracking timeout" },
 
     { nullptr, Parameter::PT_MAX, nullptr, nullptr, nullptr }
diff --git a/src/stream/ip/ip_module.cc b/src/stream/ip/ip_module.cc
index e01c25e08..f6338a757 100644
--- a/src/stream/ip/ip_module.cc
+++ b/src/stream/ip/ip_module.cc
@@ -118,7 +118,7 @@ static const Parameter s_params[] =
     { "policy", Parameter::PT_ENUM, IP_POLICIES, "linux",
       "fragment reassembly policy" },
 
-    { "session_timeout", Parameter::PT_INT, "1:max31", "30",
+    { "session_timeout", Parameter::PT_INT, "1:max31", "60",
       "session tracking timeout" },
 
     { nullptr, Parameter::PT_MAX, nullptr, nullptr, nullptr }
diff --git a/src/stream/tcp/tcp_module.cc b/src/stream/tcp/tcp_module.cc
index 4c6a6adaf..d8dfdef48 100644
--- a/src/stream/tcp/tcp_module.cc
+++ b/src/stream/tcp/tcp_module.cc
@@ -217,7 +217,7 @@ static const Parameter s_params[] =
     { "small_segments", Parameter::PT_TABLE, stream_tcp_small_params, nullptr,
       "limit number of small segments queued" },
 
-    { "session_timeout", Parameter::PT_INT, "1:max31", "30",
+    { "session_timeout", Parameter::PT_INT, "1:max31", "180",
       "session tracking timeout" },
 
     { "track_only", Parameter::PT_BOOL, nullptr, "false",
diff --git a/src/stream/user/user_module.cc b/src/stream/user/user_module.cc
index e2b115fbe..9a1b8bd7c 100644
--- a/src/stream/user/user_module.cc
+++ b/src/stream/user/user_module.cc
@@ -37,7 +37,7 @@ THREAD_LOCAL const Trace* stream_user_trace = nullptr;
 
 static const Parameter s_params[] =
 {
-    { "session_timeout", Parameter::PT_INT, "1:max31", "30",
+    { "session_timeout", Parameter::PT_INT, "1:max31", "60",
       "session tracking timeout" },
 
     { nullptr, Parameter::PT_MAX, nullptr, nullptr, nullptr }