From c25921edf01c9f2d2e3c639037528ef5440c566e Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Sun, 25 Jul 2010 15:01:47 +0200 Subject: [PATCH] Add config output for new stream settings. --- src/stream-tcp.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/stream-tcp.c b/src/stream-tcp.c index 325dc3a6f2..2637b76c58 100644 --- a/src/stream-tcp.c +++ b/src/stream-tcp.c @@ -383,18 +383,6 @@ void StreamTcpInitConfig(char quiet) stream_config.memcap = STREAMTCP_DEFAULT_MEMCAP; } - if ((ConfGetInt("stream.reassembly.memcap", &value)) == 1) { - stream_config.reassembly_memcap = (uint32_t)value; - } else { - stream_config.reassembly_memcap = STREAMTCP_DEFAULT_REASSEMBLY_MEMCAP; - } - - if ((ConfGetInt("stream.reassembly.depth", &value)) == 1) { - stream_config.reassembly_depth = (uint32_t)value; - } else { - stream_config.reassembly_depth = 0; - } - if (!quiet) { SCLogInfo("stream \"memcap\": %"PRIu32"", stream_config.memcap); } @@ -414,6 +402,24 @@ void StreamTcpInitConfig(char quiet) SCLogInfo("stream \"async_oneside\": %s", stream_config.async_oneside ? "enabled" : "disabled"); } + if ((ConfGetInt("stream.reassembly.memcap", &value)) == 1) { + stream_config.reassembly_memcap = (uint32_t)value; + } else { + stream_config.reassembly_memcap = STREAMTCP_DEFAULT_REASSEMBLY_MEMCAP; + } + if (!quiet) { + SCLogInfo("stream.reassembly \"memcap\": %"PRIu32"", stream_config.reassembly_memcap); + } + + if ((ConfGetInt("stream.reassembly.depth", &value)) == 1) { + stream_config.reassembly_depth = (uint32_t)value; + } else { + stream_config.reassembly_depth = 0; + } + if (!quiet) { + SCLogInfo("stream.reassembly \"depth\": %"PRIu32"", stream_config.reassembly_depth); + } + /* init the memcap and it's lock */ stream_memuse = 0; stream_memuse_max = 0;