aboutsummaryrefslogtreecommitdiffstats
path: root/framework/src/suricata/src/flow.c
diff options
context:
space:
mode:
authorAshlee Young <ashlee@wildernessvoice.com>2015-11-24 23:17:00 -0800
committerAshlee Young <ashlee@wildernessvoice.com>2015-11-24 23:17:00 -0800
commit43f0d5031db2a43ecdbee6f7dfda75cef6d4f56e (patch)
treef73f4185f5fe44cc44b823cb6137542be7edc9ef /framework/src/suricata/src/flow.c
parent77ce3be7567bd01c66d8ee88a93b485666723501 (diff)
Added apache 2 license verbage
Change-Id: I6a0b484496f7f3ba77c3584f5ab5a1acf353b298 Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>
Diffstat (limited to 'framework/src/suricata/src/flow.c')
-rw-r--r--framework/src/suricata/src/flow.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/src/suricata/src/flow.c b/framework/src/suricata/src/flow.c
index 42099c3a..abd9e7e5 100644
--- a/framework/src/suricata/src/flow.c
+++ b/framework/src/suricata/src/flow.c
@@ -443,7 +443,7 @@ void FlowInitConfig(char quiet)
/* pre allocate flows */
for (i = 0; i < flow_config.prealloc; i++) {
- if (!(FLOW_CHECK_MEMCAP(sizeof(Flow)))) {
+ if (!(FLOW_CHECK_MEMCAP(sizeof(Flow) + FlowStorageSize()))) {
SCLogError(SC_ERR_FLOW_INIT, "preallocating flows failed: "
"max flow memcap reached. Memcap %"PRIu64", "
"Memuse %"PRIu64".", flow_config.memcap,
@@ -462,7 +462,7 @@ void FlowInitConfig(char quiet)
if (quiet == FALSE) {
SCLogInfo("preallocated %" PRIu32 " flows of size %" PRIuMAX "",
- flow_spare_q.len, (uintmax_t)sizeof(Flow));
+ flow_spare_q.len, (uintmax_t)(sizeof(Flow) + + FlowStorageSize()));
SCLogInfo("flow memory usage: %llu bytes, maximum: %"PRIu64,
SC_ATOMIC_GET(flow_memuse), flow_config.memcap);
}