Merge pull request #1559 in SNORT/snort3 from ~RUCOMBS/snort3:memory_tuning to master

Squashed commit of the following:

commit 2874195e426137dc9386085c2383cdd0cde0042c
Author: russ <rucombs@cisco.com>
Date:   Mon Mar 25 16:26:26 2019 -0400

    memory: increase default tcp cache cap weight; fix default values

diff --git a/src/stream/base/stream_module.cc b/src/stream/base/stream_module.cc
index c6aa2e058d33a070e51db77e0d2e6bf0b5df1e4e..e3f3a2fdeb2da76feabc0b80dc109ca7d13bb28e 100644 (file)
--- a/src/stream/base/stream_module.cc
+++ b/src/stream/base/stream_module.cc
@@ -49,7 +49,7 @@ static const Parameter name[] = \
     { "idle_timeout", Parameter::PT_INT, "1:max32", idle, \
       "maximum inactive time before retiring session tracker" }, \
  \
-    { "cap_weight", Parameter::PT_INT, "0:65535", idle, \
+    { "cap_weight", Parameter::PT_INT, "0:65535", weight, \
       "additional bytes to track per flow for better estimation against cap" }, \
  \
     { nullptr, Parameter::PT_MAX, nullptr, nullptr, nullptr } \
@@ -57,7 +57,7 @@ static const Parameter name[] = \
 
 CACHE_PARAMS(ip_params,    "16384",  "30",  "180", "64");
 CACHE_PARAMS(icmp_params,  "65536",  "30",  "180", "8");
-CACHE_PARAMS(tcp_params,  "262144",  "30", "3600", "256");
+CACHE_PARAMS(tcp_params,  "262144",  "30", "3600", "11500");
 CACHE_PARAMS(udp_params,  "131072",  "30",  "180", "128");
 CACHE_PARAMS(user_params,   "1024",  "30",  "180", "256");
 CACHE_PARAMS(file_params,    "128",  "30",  "180", "32");