From 204302cbacb9a4f6447af2d36ea2a37c815ea2f9 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Tue, 8 Sep 2020 10:40:06 +0200 Subject: [PATCH] flow: minor code cleanup --- src/flow-manager.c | 2 +- src/flow-timeout.c | 3 +-- src/flow-timeout.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/flow-manager.c b/src/flow-manager.c index a06f8caa23..7bffebeedc 100644 --- a/src/flow-manager.c +++ b/src/flow-manager.c @@ -332,7 +332,7 @@ static uint32_t ProcessAsideQueue(FlowManagerTimeoutThread *td, FlowTimeoutCount f->flow_state != FLOW_STATE_LOCAL_BYPASSED && FlowForceReassemblyNeedReassembly(f) == 1) { - FlowForceReassemblyForFlow(f); // TODO error check? + FlowForceReassemblyForFlow(f); /* flow ownership is passed to the worker thread */ /* flow remains locked */ diff --git a/src/flow-timeout.c b/src/flow-timeout.c index e48e705122..d5deb190d0 100644 --- a/src/flow-timeout.c +++ b/src/flow-timeout.c @@ -345,11 +345,10 @@ int FlowForceReassemblyNeedReassembly(Flow *f) * * \retval 0 This flow doesn't need any reassembly processing; 1 otherwise. */ -int FlowForceReassemblyForFlow(Flow *f) +void FlowForceReassemblyForFlow(Flow *f) { const int thread_id = (int)f->thread_id[0]; TmThreadsInjectFlowById(f, thread_id); - return 1; } /** diff --git a/src/flow-timeout.h b/src/flow-timeout.h index 1430119cae..f6c9529879 100644 --- a/src/flow-timeout.h +++ b/src/flow-timeout.h @@ -24,7 +24,7 @@ #ifndef __FLOW_TIMEOUT_H__ #define __FLOW_TIMEOUT_H__ -int FlowForceReassemblyForFlow(Flow *f); +void FlowForceReassemblyForFlow(Flow *f); int FlowForceReassemblyNeedReassembly(Flow *f); void FlowForceReassembly(void); void FlowForceReassemblySetup(int detect_disabled); -- 2.47.2