streaming: add sbcfg to StreamingBufferClear

diff --git a/src/stream-tcp-list.c b/src/stream-tcp-list.c
index 50d51eaf74bc7e136cc687b9c687796334d2749b..60615ec8c9348595bff519ff922c4419d3ef866a 100644 (file)
--- a/src/stream-tcp-list.c
+++ b/src/stream-tcp-list.c
@@ -914,7 +914,7 @@ void StreamTcpPruneSession(Flow *f, uint8_t flags)
         SCLogDebug("ssn %p / stream %p: reassembly depth reached, "
                  "STREAMTCP_STREAM_FLAG_NOREASSEMBLY set", ssn, stream);
         StreamTcpReturnStreamSegments(stream);
-        StreamingBufferClear(&stream->sb);
+        StreamingBufferClear(&stream->sb, &stream_config.sbcnf);
         return;
 
     } else if ((ssn->flags & STREAMTCP_FLAG_APP_LAYER_DISABLED) &&
@@ -923,7 +923,7 @@ void StreamTcpPruneSession(Flow *f, uint8_t flags)
                  "STREAMTCP_STREAM_FLAG_NOREASSEMBLY set", ssn, stream);
         stream->flags |= STREAMTCP_STREAM_FLAG_NOREASSEMBLY;
         StreamTcpReturnStreamSegments(stream);
-        StreamingBufferClear(&stream->sb);
+        StreamingBufferClear(&stream->sb, &stream_config.sbcnf);
         return;
     }
 

diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index 669f0c3096a6931b27c118f339b2f4d3dfec15d0..c4356a3bf2d5ac446071445a08177190f4610505 100644 (file)
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -200,7 +200,7 @@ void StreamTcpStreamCleanup(TcpStream *stream)
     if (stream != NULL) {
         StreamTcpSackFreeList(stream);
         StreamTcpReturnStreamSegments(stream);
-        StreamingBufferClear(&stream->sb);
+        StreamingBufferClear(&stream->sb, &stream_config.sbcnf);
     }
 }
 

diff --git a/src/util-streaming-buffer.c b/src/util-streaming-buffer.c
index 8700c6613fbebd6ba47e87b528b11b728a65ab4b..c54737ded7d1c24b1e9d47ca14aa2c56744da719 100644 (file)
--- a/src/util-streaming-buffer.c
+++ b/src/util-streaming-buffer.c
@@ -154,7 +154,7 @@ StreamingBuffer *StreamingBufferInit(const StreamingBufferConfig *cfg)
     return NULL;
 }
 
-void StreamingBufferClear(StreamingBuffer *sb)
+void StreamingBufferClear(StreamingBuffer *sb, const StreamingBufferConfig *cfg)
 {
     if (sb != NULL) {
         SCLogDebug("sb->region.buf_size %u max %u", sb->region.buf_size, sb->buf_size_max);
@@ -180,7 +180,7 @@ void StreamingBufferClear(StreamingBuffer *sb)
 void StreamingBufferFree(StreamingBuffer *sb, const StreamingBufferConfig *cfg)
 {
     if (sb != NULL) {
-        StreamingBufferClear(sb);
+        StreamingBufferClear(sb, cfg);
         FREE(sb->cfg, sb, sizeof(StreamingBuffer));
     }
 }

diff --git a/src/util-streaming-buffer.h b/src/util-streaming-buffer.h
index bc5182559b5dd7697140d4078f95f9ef3c9a36db..263a45de15c989b12229fa04d5ddce1e1a325ed7 100644 (file)
--- a/src/util-streaming-buffer.h
+++ b/src/util-streaming-buffer.h
@@ -157,7 +157,7 @@ typedef struct StreamingBufferSegment_ {
 } __attribute__((__packed__)) StreamingBufferSegment;
 
 StreamingBuffer *StreamingBufferInit(const StreamingBufferConfig *cfg);
-void StreamingBufferClear(StreamingBuffer *sb);
+void StreamingBufferClear(StreamingBuffer *sb, const StreamingBufferConfig *cfg);
 void StreamingBufferFree(StreamingBuffer *sb, const StreamingBufferConfig *cfg);
 
 void StreamingBufferSlideToOffset(