From: Victor Julien Date: Tue, 3 Dec 2013 13:36:25 +0000 (+0100) Subject: flow: fix typo in function name X-Git-Tag: suricata-2.0beta2~60 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85b1a8ff26a0a8ba1e3f0a0c9e92f6fb08c2733d;p=thirdparty%2Fsuricata.git flow: fix typo in function name FlowForceReassemblyNeedReassmbly -> FlowForceReassemblyNeedReassembly --- diff --git a/src/flow-manager.c b/src/flow-manager.c index f158fda85c..17a2b280a6 100644 --- a/src/flow-manager.c +++ b/src/flow-manager.c @@ -229,7 +229,7 @@ static int FlowManagerFlowTimedOut(Flow *f, struct timeval *ts) { int server = 0, client = 0; if (!(f->flags & FLOW_TIMEOUT_REASSEMBLY_DONE) && - FlowForceReassemblyNeedReassmbly(f, &server, &client) == 1) { + FlowForceReassemblyNeedReassembly(f, &server, &client) == 1) { FlowForceReassemblyForFlowV2(f, server, client); return 0; } diff --git a/src/flow-timeout.c b/src/flow-timeout.c index ac9d5f2d17..4939736cc6 100644 --- a/src/flow-timeout.c +++ b/src/flow-timeout.c @@ -280,7 +280,7 @@ static inline Packet *FlowForceReassemblyPseudoPacketGet(int direction, } /** - * \brief Check if a flow needs forced reassembly + * \brief Check if a flow needs forced reassembly, or any other processing * * \param f *LOCKED* flow * \param server ptr to int that should be set to 1 or 2 if we return 1 @@ -289,7 +289,7 @@ static inline Packet *FlowForceReassemblyPseudoPacketGet(int direction, * \retval 0 no * \retval 1 yes */ -int FlowForceReassemblyNeedReassmbly(Flow *f, int *server, int *client) { +int FlowForceReassemblyNeedReassembly(Flow *f, int *server, int *client) { TcpSession *ssn; if (f == NULL) { @@ -545,7 +545,7 @@ static inline void FlowForceReassemblyForHash(void) continue; } - (void)FlowForceReassemblyNeedReassmbly(f, &server_ok, &client_ok); + (void)FlowForceReassemblyNeedReassembly(f, &server_ok, &client_ok); /* ah ah! We have some unattended toserver segments */ if (client_ok == STREAM_HAS_UNPROCESSED_SEGMENTS_NEED_REASSEMBLY) { diff --git a/src/flow-timeout.h b/src/flow-timeout.h index c36a4fecf3..0345c7ebd0 100644 --- a/src/flow-timeout.h +++ b/src/flow-timeout.h @@ -25,7 +25,7 @@ #define __FLOW_TIMEOUT_H__ int FlowForceReassemblyForFlowV2(Flow *f, int server, int client); -int FlowForceReassemblyNeedReassmbly(Flow *f, int *server, int *client); +int FlowForceReassemblyNeedReassembly(Flow *f, int *server, int *client); void FlowForceReassembly(void); void FlowForceReassemblySetup(void);