stream: update memcaps in code to match config

(cherry picked from commit b08a7b9a66d04f21241e8d1b75e0c6ff9ae69d8c)

diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index 8d3611285a8fa7f7cdc70e7e1897a0129a4219b5..0a5046c686dc844157fde1fa46fb3074b7e1ad99 100644 (file)
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -80,8 +80,8 @@
 //#define DEBUG
 
 #define STREAMTCP_DEFAULT_PREALLOC              2048
-#define STREAMTCP_DEFAULT_MEMCAP                (32 * 1024 * 1024) /* 32mb */
-#define STREAMTCP_DEFAULT_REASSEMBLY_MEMCAP     (64 * 1024 * 1024) /* 64mb */
+#define STREAMTCP_DEFAULT_MEMCAP                (64 * 1024 * 1024)  /* 64mb */
+#define STREAMTCP_DEFAULT_REASSEMBLY_MEMCAP     (256 * 1024 * 1024) /* 256mb */
 #define STREAMTCP_DEFAULT_TOSERVER_CHUNK_SIZE   2560
 #define STREAMTCP_DEFAULT_TOCLIENT_CHUNK_SIZE   2560
 #define STREAMTCP_DEFAULT_MAX_SYNACK_QUEUED     5

diff --git a/suricata.yaml.in b/suricata.yaml.in
index 8b4e123d39a28168ee8abe8e820483b10185c1aa..6dfaf26690d6c791dc2969ad55991bc2d0e1ac39 100644 (file)
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -1254,7 +1254,7 @@ flow-timeouts:
 # engine is configured.
 #
 # stream:
-#   memcap: 32mb                # Can be specified in kb, mb, gb.  Just a
+#   memcap: 64mb                # Can be specified in kb, mb, gb.  Just a
 #                               # number indicates it's in bytes.
 #   checksum-validation: yes    # To validate the checksum of received
 #                               # packet. If csum validation is specified as
@@ -1276,7 +1276,7 @@ flow-timeouts:
 #                               # the bypass.
 #
 #   reassembly:
-#     memcap: 64mb              # Can be specified in kb, mb, gb.  Just a number
+#     memcap: 256mb             # Can be specified in kb, mb, gb.  Just a number
 #                               # indicates it's in bytes.
 #     depth: 1mb                # Can be specified in kb, mb, gb.  Just a number
 #                               # indicates it's in bytes.