stream: small cleanups

diff --git a/src/stream-tcp-reassemble.h b/src/stream-tcp-reassemble.h
index 5cdf88e6eb02eeab06b188b3b8fe83479178c4ba..7dd4c666f2a562ad954dd014089a975b94d32938 100644 (file)
--- a/src/stream-tcp-reassemble.h
+++ b/src/stream-tcp-reassemble.h
@@ -79,9 +79,6 @@ void StreamTcpSetSessionNoReassemblyFlag (TcpSession *, char );
 void StreamTcpSetDisableRawReassemblyFlag (TcpSession *ssn, char direction);
 
 void StreamTcpSetOSPolicy(TcpStream *, Packet *);
-void StreamTcpReassemblePause (TcpSession *, char );
-void StreamTcpReassembleUnPause (TcpSession *, char );
-int StreamTcpCheckStreamContents(uint8_t *, uint16_t , TcpStream *);
 
 int StreamTcpReassembleHandleSegmentHandleData(ThreadVars *tv, TcpReassemblyThreadCtx *ra_ctx,
         TcpSession *ssn, TcpStream *stream, Packet *p);
@@ -103,5 +100,9 @@ int StreamTcpReassembleCheckMemcap(uint32_t size);
 void StreamTcpDisableAppLayer(Flow *f);
 int StreamTcpAppLayerIsDisabled(Flow *f);
 
+#ifdef UNITTESTS
+int StreamTcpCheckStreamContents(uint8_t *, uint16_t , TcpStream *);
+#endif
+
 #endif /* __STREAM_TCP_REASSEMBLE_H__ */
 

diff --git a/src/stream-tcp.h b/src/stream-tcp.h
index fb69ed145ee3f911448aa4094c37b08176cf8ef9..2a42785c5506d59c54f545beac8c00a0bdc3ed71 100644 (file)
--- a/src/stream-tcp.h
+++ b/src/stream-tcp.h
@@ -27,10 +27,6 @@
 
 #include "stream-tcp-private.h"
 
-#define COUNTER_STREAMTCP_STREAMS 1
-
-#include "app-layer-detect-proto.h"
-#include "util-mpm.h"
 #include "stream.h"
 #include "stream-tcp-reassemble.h"