streaming: add max regions config option

diff --git a/src/app-layer-htp-body.c b/src/app-layer-htp-body.c
index caed4ff9c26af6bdd8aaf014f50178e7d59d3175..8d3065bda1cdf03180e62c870003a66f5ad474c9 100644 (file)
--- a/src/app-layer-htp-body.c
+++ b/src/app-layer-htp-body.c
@@ -33,7 +33,7 @@
 #include "util-streaming-buffer.h"
 #include "util-print.h"
 
-static StreamingBufferConfig default_cfg = { 0, 3072, HTPCalloc, HTPRealloc, HTPFree };
+static StreamingBufferConfig default_cfg = { 0, 3072, 1, HTPCalloc, HTPRealloc, HTPFree };
 
 /**
  * \brief Append a chunk of body to the HtpBody struct

diff --git a/src/util-streaming-buffer.c b/src/util-streaming-buffer.c
index faf209f3c35c1c75dfdf85b8c5c6b45c9b4003b1..bd4610d71ebe061e5410efa0713ff39ec78b8698 100644 (file)
--- a/src/util-streaming-buffer.c
+++ b/src/util-streaming-buffer.c
@@ -103,6 +103,12 @@ StreamingBufferBlock *SBB_RB_FIND_INCLUSIVE(struct SBB *head, StreamingBufferBlo
 
 static inline StreamingBufferRegion *InitBufferRegion(StreamingBuffer *sb, const uint32_t min_size)
 {
+    if (sb->regions == USHRT_MAX ||
+            (sb->cfg->max_regions != 0 && sb->regions >= sb->cfg->max_regions)) {
+        SCLogDebug("max regions reached");
+        return NULL;
+    }
+
     StreamingBufferRegion *aux_r = CALLOC(sb->cfg, 1, sizeof(*aux_r));
     if (aux_r == NULL)
         return NULL;
@@ -115,8 +121,6 @@ static inline StreamingBufferRegion *InitBufferRegion(StreamingBuffer *sb, const
     aux_r->buf_size = MAX(sb->cfg->buf_size, min_size);
     sb->regions++;
     sb->max_regions = MAX(sb->regions, sb->max_regions);
-
-    BUG_ON(sb->regions > 100);
     return aux_r;
 }
 
@@ -1703,7 +1707,7 @@ static void DumpSegment(StreamingBuffer *sb, StreamingBufferSegment *seg)
 
 static int StreamingBufferTest02(void)
 {
-    StreamingBufferConfig cfg = { 8, 24, NULL, NULL, NULL };
+    StreamingBufferConfig cfg = { 8, 24, 1, NULL, NULL, NULL };
     StreamingBuffer *sb = StreamingBufferInit(&cfg);
     FAIL_IF(sb == NULL);
 
@@ -1759,7 +1763,7 @@ static int StreamingBufferTest02(void)
 
 static int StreamingBufferTest03(void)
 {
-    StreamingBufferConfig cfg = { 8, 24, NULL, NULL, NULL };
+    StreamingBufferConfig cfg = { 8, 24, 1, NULL, NULL, NULL };
     StreamingBuffer *sb = StreamingBufferInit(&cfg);
     FAIL_IF(sb == NULL);
 
@@ -1814,7 +1818,7 @@ static int StreamingBufferTest03(void)
 
 static int StreamingBufferTest04(void)
 {
-    StreamingBufferConfig cfg = { 8, 16, NULL, NULL, NULL };
+    StreamingBufferConfig cfg = { 8, 16, 1, NULL, NULL, NULL };
     StreamingBuffer *sb = StreamingBufferInit(&cfg);
     FAIL_IF(sb == NULL);
 
@@ -1905,7 +1909,7 @@ static int StreamingBufferTest04(void)
 /** \test lots of gaps in block list */
 static int StreamingBufferTest06(void)
 {
-    StreamingBufferConfig cfg = { 8, 16, NULL, NULL, NULL };
+    StreamingBufferConfig cfg = { 8, 16, 1, NULL, NULL, NULL };
     StreamingBuffer *sb = StreamingBufferInit(&cfg);
     FAIL_IF(sb == NULL);
 
@@ -1963,7 +1967,7 @@ static int StreamingBufferTest06(void)
 /** \test lots of gaps in block list */
 static int StreamingBufferTest07(void)
 {
-    StreamingBufferConfig cfg = { 8, 16, NULL, NULL, NULL };
+    StreamingBufferConfig cfg = { 8, 16, 1, NULL, NULL, NULL };
     StreamingBuffer *sb = StreamingBufferInit(&cfg);
     FAIL_IF(sb == NULL);
 
@@ -2021,7 +2025,7 @@ static int StreamingBufferTest07(void)
 /** \test lots of gaps in block list */
 static int StreamingBufferTest08(void)
 {
-    StreamingBufferConfig cfg = { 8, 16, NULL, NULL, NULL };
+    StreamingBufferConfig cfg = { 8, 16, 1, NULL, NULL, NULL };
     StreamingBuffer *sb = StreamingBufferInit(&cfg);
     FAIL_IF(sb == NULL);
 
@@ -2079,7 +2083,7 @@ static int StreamingBufferTest08(void)
 /** \test lots of gaps in block list */
 static int StreamingBufferTest09(void)
 {
-    StreamingBufferConfig cfg = { 8, 16, NULL, NULL, NULL };
+    StreamingBufferConfig cfg = { 8, 16, 1, NULL, NULL, NULL };
     StreamingBuffer *sb = StreamingBufferInit(&cfg);
     FAIL_IF(sb == NULL);
 
@@ -2137,7 +2141,7 @@ static int StreamingBufferTest09(void)
 /** \test lots of gaps in block list */
 static int StreamingBufferTest10(void)
 {
-    StreamingBufferConfig cfg = { 8, 16, NULL, NULL, NULL };
+    StreamingBufferConfig cfg = { 8, 16, 1, NULL, NULL, NULL };
     StreamingBuffer *sb = StreamingBufferInit(&cfg);
     FAIL_IF(sb == NULL);
 

diff --git a/src/util-streaming-buffer.h b/src/util-streaming-buffer.h
index 3bbfcf438d06ded5b3d94a04f98b92bfe5f6e1f6..0463b8028e1c33ea455c5b7262f579775f340f00 100644 (file)
--- a/src/util-streaming-buffer.h
+++ b/src/util-streaming-buffer.h
@@ -64,6 +64,7 @@
 typedef struct StreamingBufferConfig_ {
     uint32_t buf_slide;
     uint32_t buf_size;
+    uint16_t max_regions; /**< max concurrent memory regions. 0 means no limit. */
     void *(*Calloc)(size_t n, size_t size);
     void *(*Realloc)(void *ptr, size_t orig_size, size_t size);
     void (*Free)(void *ptr, size_t size);
@@ -71,7 +72,7 @@ typedef struct StreamingBufferConfig_ {
 
 #define STREAMING_BUFFER_CONFIG_INITIALIZER                                                        \
     {                                                                                              \
-        0, 0, NULL, NULL, NULL,                                                                    \
+        0, 0, 0, NULL, NULL, NULL,                                                                 \
     }
 
 #define STREAMING_BUFFER_REGION_INIT                                                               \