flow: minor code cleanup

pull/5381/head
Victor Julien 5 years ago
parent 42ce297e0e
commit 204302cbac

@ -332,7 +332,7 @@ static uint32_t ProcessAsideQueue(FlowManagerTimeoutThread *td, FlowTimeoutCount
f->flow_state != FLOW_STATE_LOCAL_BYPASSED && f->flow_state != FLOW_STATE_LOCAL_BYPASSED &&
FlowForceReassemblyNeedReassembly(f) == 1) FlowForceReassemblyNeedReassembly(f) == 1)
{ {
FlowForceReassemblyForFlow(f); // TODO error check? FlowForceReassemblyForFlow(f);
/* flow ownership is passed to the worker thread */ /* flow ownership is passed to the worker thread */
/* flow remains locked */ /* flow remains locked */

@ -345,11 +345,10 @@ int FlowForceReassemblyNeedReassembly(Flow *f)
* *
* \retval 0 This flow doesn't need any reassembly processing; 1 otherwise. * \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]; const int thread_id = (int)f->thread_id[0];
TmThreadsInjectFlowById(f, thread_id); TmThreadsInjectFlowById(f, thread_id);
return 1;
} }
/** /**

@ -24,7 +24,7 @@
#ifndef __FLOW_TIMEOUT_H__ #ifndef __FLOW_TIMEOUT_H__
#define __FLOW_TIMEOUT_H__ #define __FLOW_TIMEOUT_H__
int FlowForceReassemblyForFlow(Flow *f); void FlowForceReassemblyForFlow(Flow *f);
int FlowForceReassemblyNeedReassembly(Flow *f); int FlowForceReassemblyNeedReassembly(Flow *f);
void FlowForceReassembly(void); void FlowForceReassembly(void);
void FlowForceReassemblySetup(int detect_disabled); void FlowForceReassemblySetup(int detect_disabled);

Loading…
Cancel
Save