From: Victor Julien <victor@inliniac.net>
Date: Mon, 1 Dec 2014 18:18:45 +0000 (+0100)
Subject: flow-time: disable remainder of the old timeout code
X-Git-Tag: suricata-2.1beta3~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ffaad66eb770b6ea48c9e34661b71ac1d64c325;p=thirdparty%2Fsuricata.git

flow-time: disable remainder of the old timeout code

Disable registration code that was looking for threadvars
and slots as timeout handling is now done in a live engine.
---

diff --git a/src/flow-timeout.c b/src/flow-timeout.c
index 4f146ab83f..c14493fcc0 100644
--- a/src/flow-timeout.c
+++ b/src/flow-timeout.c
@@ -61,7 +61,7 @@
 #include "app-layer.h"
 
 #include "util-profiling.h"
-
+#if 0
 static TmSlot *stream_pseudo_pkt_stream_tm_slot = NULL;
 static ThreadVars *stream_pseudo_pkt_stream_TV = NULL;
 
@@ -71,13 +71,14 @@ static ThreadVars *stream_pseudo_pkt_detect_prev_TV = NULL;
 
 static TmSlot *stream_pseudo_pkt_decode_tm_slot = NULL;
 static ThreadVars *stream_pseudo_pkt_decode_TV = NULL;
-
+#endif
 /**
  * \internal
  * \brief Flush out if we have any unattended packets.
  */
 static inline void FlowForceReassemblyFlushPendingPseudoPackets(void)
 {
+#if 0
     /* we don't lock the queue, since flow manager is dead */
     if (stream_pseudo_pkt_decode_tm_slot->slot_post_pq.len == 0)
         return;
@@ -91,7 +92,7 @@ static inline void FlowForceReassemblyFlushPendingPseudoPackets(void)
         SCLogError(SC_ERR_TM_THREADS_ERROR, "Received error from FFR on "
                    "flushing packets through decode->.. TMs");
     }
-
+#endif
     return;
 }
 
@@ -734,6 +735,7 @@ void FlowForceReassembly(void)
  */
 void FlowForceReassemblySetup(int detect_disabled)
 {
+#if 0
     /* get StreamTCP TM's slot and TV containing this slot */
     stream_pseudo_pkt_stream_tm_slot = TmSlotGetSlotForTM(TMM_STREAMTCP);
     if (stream_pseudo_pkt_stream_tm_slot == NULL) {
@@ -812,4 +814,5 @@ void FlowForceReassemblySetup(int detect_disabled)
     }
 
     return;
+#endif
 }