src: new file detect-engine-buffer.h

Taken from detect-engine.h so that we can bindgen this smaller
unit.

diff --git a/src/Makefile.am b/src/Makefile.am
index 1d02693a0c54f90b1e1b78f7571ed5c2aa8967fe..31975ed1f72cc1673bf0c846a9c2b7a2105c0092 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -120,6 +120,7 @@ noinst_HEADERS = \
        detect-engine-address-ipv6.h \
        detect-engine-alert.h \
        detect-engine-analyzer.h \
+       detect-engine-buffer.h \
        detect-engine-build.h \
        detect-engine-content-inspection.h \
        detect-engine-dcepayload.h \
@@ -709,6 +710,7 @@ libsuricata_c_a_SOURCES = \
        detect-engine-alert.c \
        detect-engine-analyzer.c \
        detect-engine-build.c \
+       detect-engine-buffer.c \
        detect-engine.c \
        detect-engine-content-inspection.c \
        detect-engine-dcepayload.c \

diff --git a/src/detect-bsize.c b/src/detect-bsize.c
index c007960a5720928d641764c4a99ae6f9d883b656..3933953cd2166ca14b9b04e6cb87e4900e3bc7f6 100644 (file)
--- a/src/detect-bsize.c
+++ b/src/detect-bsize.c
@@ -30,6 +30,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-content.h"
 #include "detect-engine-uint.h"
 

diff --git a/src/detect-byte-extract.c b/src/detect-byte-extract.c
index d590183f9c772600c5f893e9af6520a770a7b03e..dc83020d2e749fafb49c534c99076e7b95b1b99b 100644 (file)
--- a/src/detect-byte-extract.c
+++ b/src/detect-byte-extract.c
@@ -407,6 +407,8 @@ SigMatch *DetectByteExtractRetrieveSMVar(const char *arg, const Signature *s)
 
 #ifdef UNITTESTS
 
+#include "detect-engine-buffer.h"
+
 static int g_file_data_buffer_id = 0;
 static int g_http_uri_buffer_id = 0;
 

diff --git a/src/detect-bytejump.c b/src/detect-bytejump.c
index e04d8a7a94fbea42f2503aaaaee7e193a1ceccc7..668333fd0d8db025618586b16a702cc35ef50c32 100644 (file)
--- a/src/detect-bytejump.c
+++ b/src/detect-bytejump.c
@@ -28,6 +28,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "app-layer.h"
 
 #include "detect-byte.h"

diff --git a/src/detect-bytemath.c b/src/detect-bytemath.c
index babbee86894145d532413d30c6d4f85f5bdbde05..2a651567d96fe23c5f368b7ace16c60b608f0dd6 100644 (file)
--- a/src/detect-bytemath.c
+++ b/src/detect-bytemath.c
@@ -35,6 +35,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-build.h"

diff --git a/src/detect-bytetest.c b/src/detect-bytetest.c
index e637c5999ce6281af0e0858c52436606babad852..051523306ed1317b1d0b50e791bea14eb8415cb8 100644 (file)
--- a/src/detect-bytetest.c
+++ b/src/detect-bytetest.c
@@ -28,6 +28,7 @@
 #include "decode.h"
 #include "detect.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-parse.h"
 #include "detect-engine-build.h"
 

diff --git a/src/detect-content.c b/src/detect-content.c
index 7e35c60770f0fea6dae93d9c5e7907da1310baa5..3c6cab33476700b93449f420c37d3278b57bfc72 100644 (file)
--- a/src/detect-content.c
+++ b/src/detect-content.c
@@ -30,6 +30,7 @@
 #include "detect-uricontent.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-build.h"
 #include "detect-engine-state.h"
 #include "detect-parse.h"

diff --git a/src/detect-datarep.c b/src/detect-datarep.c
index 325046786de6dc31c949a0ffc7a25a0e75a99f9c..a5e354070178ef34383b6380a724e584cb9ab738 100644 (file)
--- a/src/detect-datarep.c
+++ b/src/detect-datarep.c
@@ -32,6 +32,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 

diff --git a/src/detect-dataset.c b/src/detect-dataset.c
index 6aec3fde688c367c2db36023bff365a519bb14d3..4efa2dce74dd0a79c666c805518f00c6bba2034a 100644 (file)
--- a/src/detect-dataset.c
+++ b/src/detect-dataset.c
@@ -32,6 +32,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 

diff --git a/src/detect-dce-stub-data.c b/src/detect-dce-stub-data.c
index 9005806e9d915632ede478a94feaed85dacd8dbf..81d9ce8fb01a9f24f874a6a55d6e2b19f9384527 100644 (file)
--- a/src/detect-dce-stub-data.c
+++ b/src/detect-dce-stub-data.c
@@ -30,6 +30,7 @@
 #include "detect-parse.h"
 
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-build.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"

diff --git a/src/detect-dnp3.c b/src/detect-dnp3.c
index de4edbbadf413eee5bd8bf47331dd0cbf8a7ec73..cde1560b1618c8ba322d3d2bf6a5aa59fa1bf283 100644 (file)
--- a/src/detect-dnp3.c
+++ b/src/detect-dnp3.c
@@ -23,6 +23,7 @@
 #include "detect-parse.h"
 #include "detect-dnp3.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"

diff --git a/src/detect-dns-name.c b/src/detect-dns-name.c
index 24c30ee5133977fb608202d114ec9787769557a2..83e045c95dcc28660904296772a3b6a3a51b04ad 100644 (file)
--- a/src/detect-dns-name.c
+++ b/src/detect-dns-name.c
@@ -28,6 +28,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-content-inspection.h"
 #include "detect-engine-helper.h"
 #include "detect-dns-name.h"

diff --git a/src/detect-dns-response.c b/src/detect-dns-response.c
index 9df17e49379031e10ed91cef3dc85f85c071c779..121a00311960da2e721f83f7635362aadf3dfa88 100644 (file)
--- a/src/detect-dns-response.c
+++ b/src/detect-dns-response.c
@@ -24,6 +24,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"
 #include "detect-dns-response.h"

diff --git a/src/detect-email.c b/src/detect-email.c
index 4f35bb2660904d9ecfc07de700f141841c0bea2e..9e64e1d4d233a0f19ef63a6f3577f8eae87fa7c6 100644 (file)
--- a/src/detect-email.c
+++ b/src/detect-email.c
@@ -16,6 +16,7 @@
  */
 
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-helper.h"
 #include "detect-parse.h"
 #include "app-layer-smtp.h"

diff --git a/src/detect-engine-buffer.c b/src/detect-engine-buffer.c
new file mode 100644 (file)
index 0000000..4cb359b
--- /dev/null
+++ b/src/detect-engine-buffer.c
@@ -0,0 +1,176 @@
+/* Copyright (C) 2025 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+/**
+ * \file
+ *
+ * \author Victor Julien <victor@inliniac.net>
+ */
+
+#include "suricata-common.h"
+#include "detect-engine.h"
+#include "detect-parse.h"
+#include "detect-engine-buffer.h"
+
+int DetectBufferSetActiveList(DetectEngineCtx *de_ctx, Signature *s, const int list)
+{
+    BUG_ON(s->init_data == NULL);
+
+    if (s->init_data->list == DETECT_SM_LIST_BASE64_DATA) {
+        SCLogError("Rule buffer cannot be reset after base64_data.");
+        return -1;
+    }
+
+    if (s->init_data->list && s->init_data->transforms.cnt) {
+        SCLogError("no matches following transform(s)");
+        return -1;
+    }
+    s->init_data->list = list;
+    s->init_data->list_set = true;
+
+    // check if last has matches -> if no, error
+    if (s->init_data->curbuf && s->init_data->curbuf->head == NULL) {
+        SCLogError("previous sticky buffer has no matches");
+        return -1;
+    }
+
+    for (uint32_t x = 0; x < s->init_data->buffers_size; x++) {
+        SignatureInitDataBuffer *b = &s->init_data->buffers[x];
+        for (SigMatch *sm = b->head; sm != NULL; sm = sm->next) {
+            SCLogDebug(
+                    "buf:%p: id:%u: '%s' pos %u", b, b->id, sigmatch_table[sm->type].name, sm->idx);
+        }
+        if ((uint32_t)list == b->id) {
+            SCLogDebug("found buffer %p for list %d", b, list);
+            if (s->init_data->buffers[x].sm_init) {
+                s->init_data->buffers[x].sm_init = false;
+                SCLogDebug("sm_init was true for %p list %d", b, list);
+                s->init_data->curbuf = b;
+                return 0;
+
+            } else if (DetectEngineBufferTypeSupportsMultiInstanceGetById(de_ctx, list)) {
+                // fall through
+            } else if (!b->only_ts && (s->init_data->init_flags & SIG_FLAG_INIT_FORCE_TOSERVER)) {
+                // fall through
+            } else if (!b->only_tc && (s->init_data->init_flags & SIG_FLAG_INIT_FORCE_TOCLIENT)) {
+                // fall through
+            } else {
+                // we create a new buffer for the same id but forced different direction
+                SCLogWarning("duplicate instance for %s in '%s'",
+                        DetectEngineBufferTypeGetNameById(de_ctx, list), s->sig_str);
+                s->init_data->curbuf = b;
+                return 0;
+            }
+        }
+    }
+
+    if (list < DETECT_SM_LIST_MAX)
+        return 0;
+
+    if (SignatureInitDataBufferCheckExpand(s) < 0) {
+        SCLogError("failed to expand rule buffer array");
+        return -1;
+    }
+
+    /* initialize new buffer */
+    s->init_data->curbuf = &s->init_data->buffers[s->init_data->buffer_index++];
+    s->init_data->curbuf->id = list;
+    s->init_data->curbuf->head = NULL;
+    s->init_data->curbuf->tail = NULL;
+    s->init_data->curbuf->multi_capable =
+            DetectEngineBufferTypeSupportsMultiInstanceGetById(de_ctx, list);
+    if (s->init_data->init_flags & SIG_FLAG_INIT_FORCE_TOCLIENT) {
+        s->init_data->curbuf->only_tc = true;
+    }
+    if (s->init_data->init_flags & SIG_FLAG_INIT_FORCE_TOSERVER) {
+        s->init_data->curbuf->only_ts = true;
+    }
+
+    SCLogDebug("new: idx %u list %d set up curbuf %p", s->init_data->buffer_index - 1, list,
+            s->init_data->curbuf);
+
+    return 0;
+}
+
+int DetectBufferGetActiveList(DetectEngineCtx *de_ctx, Signature *s)
+{
+    BUG_ON(s->init_data == NULL);
+
+    if (s->init_data->list && s->init_data->transforms.cnt) {
+        if (s->init_data->list == DETECT_SM_LIST_NOTSET ||
+                s->init_data->list < DETECT_SM_LIST_DYNAMIC_START) {
+            SCLogError("previous transforms not consumed "
+                       "(list: %u, transform_cnt %u)",
+                    s->init_data->list, s->init_data->transforms.cnt);
+            SCReturnInt(-1);
+        }
+
+        SCLogDebug("buffer %d has transform(s) registered: %d", s->init_data->list,
+                s->init_data->transforms.cnt);
+        int new_list = DetectEngineBufferTypeGetByIdTransforms(de_ctx, s->init_data->list,
+                s->init_data->transforms.transforms, s->init_data->transforms.cnt);
+        if (new_list == -1) {
+            SCReturnInt(-1);
+        }
+        int base_list = s->init_data->list;
+        SCLogDebug("new_list %d", new_list);
+        s->init_data->list = new_list;
+        s->init_data->list_set = false;
+        // reset transforms now that we've set up the list
+        s->init_data->transforms.cnt = 0;
+
+        if (s->init_data->curbuf && s->init_data->curbuf->head != NULL) {
+            if (SignatureInitDataBufferCheckExpand(s) < 0) {
+                SCLogError("failed to expand rule buffer array");
+                return -1;
+            }
+            s->init_data->curbuf = &s->init_data->buffers[s->init_data->buffer_index++];
+            s->init_data->curbuf->multi_capable =
+                    DetectEngineBufferTypeSupportsMultiInstanceGetById(de_ctx, base_list);
+        }
+        if (s->init_data->curbuf == NULL) {
+            SCLogError("failed to setup buffer");
+            DEBUG_VALIDATE_BUG_ON(1);
+            SCReturnInt(-1);
+        }
+        s->init_data->curbuf->id = new_list;
+        SCLogDebug("new list after applying transforms: %u", new_list);
+    }
+
+    SCReturnInt(0);
+}
+
+SigMatch *DetectBufferGetFirstSigMatch(const Signature *s, const uint32_t buf_id)
+{
+    for (uint32_t i = 0; i < s->init_data->buffer_index; i++) {
+        if (buf_id == s->init_data->buffers[i].id) {
+            return s->init_data->buffers[i].head;
+        }
+    }
+    return NULL;
+}
+
+SigMatch *DetectBufferGetLastSigMatch(const Signature *s, const uint32_t buf_id)
+{
+    SigMatch *last = NULL;
+    for (uint32_t i = 0; i < s->init_data->buffer_index; i++) {
+        if (buf_id == s->init_data->buffers[i].id) {
+            last = s->init_data->buffers[i].tail;
+        }
+    }
+    return last;
+}

diff --git a/src/detect-engine-buffer.h b/src/detect-engine-buffer.h
new file mode 100644 (file)
index 0000000..5031ee4
--- /dev/null
+++ b/src/detect-engine-buffer.h
@@ -0,0 +1,34 @@
+/* Copyright (C) 2025 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+/**
+ * \file
+ *
+ * \author Victor Julien <victor@inliniac.net>
+ */
+
+#ifndef SURICATA_DETECT_ENGINE_BUFFER_H
+#define SURICATA_DETECT_ENGINE_BUFFER_H
+
+#include "detect.h"
+
+int WARN_UNUSED DetectBufferSetActiveList(DetectEngineCtx *de_ctx, Signature *s, const int list);
+int DetectBufferGetActiveList(DetectEngineCtx *de_ctx, Signature *s);
+SigMatch *DetectBufferGetFirstSigMatch(const Signature *s, const uint32_t buf_id);
+SigMatch *DetectBufferGetLastSigMatch(const Signature *s, const uint32_t buf_id);
+
+#endif /* SURICATA_DETECT_ENGINE_BUFFER_H */

diff --git a/src/detect-engine.c b/src/detect-engine.c
index f6fed8a495476244e6e42adefd0a87459d32d2b7..d1c6a2b2ad087d5b65b8214e872b904585090403 100644 (file)
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -1388,27 +1388,6 @@ bool DetectEngineBufferRunValidateCallback(
     return true;
 }
 
-SigMatch *DetectBufferGetFirstSigMatch(const Signature *s, const uint32_t buf_id)
-{
-    for (uint32_t i = 0; i < s->init_data->buffer_index; i++) {
-        if (buf_id == s->init_data->buffers[i].id) {
-            return s->init_data->buffers[i].head;
-        }
-    }
-    return NULL;
-}
-
-SigMatch *DetectBufferGetLastSigMatch(const Signature *s, const uint32_t buf_id)
-{
-    SigMatch *last = NULL;
-    for (uint32_t i = 0; i < s->init_data->buffer_index; i++) {
-        if (buf_id == s->init_data->buffers[i].id) {
-            last = s->init_data->buffers[i].tail;
-        }
-    }
-    return last;
-}
-
 bool DetectBufferIsPresent(const Signature *s, const uint32_t buf_id)
 {
     for (uint32_t i = 0; i < s->init_data->buffer_index; i++) {
@@ -1419,134 +1398,6 @@ bool DetectBufferIsPresent(const Signature *s, const uint32_t buf_id)
     return false;
 }
 
-int DetectBufferSetActiveList(DetectEngineCtx *de_ctx, Signature *s, const int list)
-{
-    BUG_ON(s->init_data == NULL);
-
-    if (s->init_data->list == DETECT_SM_LIST_BASE64_DATA) {
-        SCLogError("Rule buffer cannot be reset after base64_data.");
-        return -1;
-    }
-
-    if (s->init_data->list && s->init_data->transforms.cnt) {
-        SCLogError("no matches following transform(s)");
-        return -1;
-    }
-    s->init_data->list = list;
-    s->init_data->list_set = true;
-
-    // check if last has matches -> if no, error
-    if (s->init_data->curbuf && s->init_data->curbuf->head == NULL) {
-        SCLogError("previous sticky buffer has no matches");
-        return -1;
-    }
-
-    for (uint32_t x = 0; x < s->init_data->buffers_size; x++) {
-        SignatureInitDataBuffer *b = &s->init_data->buffers[x];
-        for (SigMatch *sm = b->head; sm != NULL; sm = sm->next) {
-            SCLogDebug(
-                    "buf:%p: id:%u: '%s' pos %u", b, b->id, sigmatch_table[sm->type].name, sm->idx);
-        }
-        if ((uint32_t)list == b->id) {
-            SCLogDebug("found buffer %p for list %d", b, list);
-            if (s->init_data->buffers[x].sm_init) {
-                s->init_data->buffers[x].sm_init = false;
-                SCLogDebug("sm_init was true for %p list %d", b, list);
-                s->init_data->curbuf = b;
-                return 0;
-
-            } else if (DetectEngineBufferTypeSupportsMultiInstanceGetById(de_ctx, list)) {
-                // fall through
-            } else if (!b->only_ts && (s->init_data->init_flags & SIG_FLAG_INIT_FORCE_TOSERVER)) {
-                // fall through
-            } else if (!b->only_tc && (s->init_data->init_flags & SIG_FLAG_INIT_FORCE_TOCLIENT)) {
-                // fall through
-            } else {
-                // we create a new buffer for the same id but forced different direction
-                SCLogWarning("duplicate instance for %s in '%s'",
-                        DetectEngineBufferTypeGetNameById(de_ctx, list), s->sig_str);
-                s->init_data->curbuf = b;
-                return 0;
-            }
-        }
-    }
-
-    if (list < DETECT_SM_LIST_MAX)
-        return 0;
-
-    if (SignatureInitDataBufferCheckExpand(s) < 0) {
-        SCLogError("failed to expand rule buffer array");
-        return -1;
-    }
-
-    /* initialize new buffer */
-    s->init_data->curbuf = &s->init_data->buffers[s->init_data->buffer_index++];
-    s->init_data->curbuf->id = list;
-    s->init_data->curbuf->head = NULL;
-    s->init_data->curbuf->tail = NULL;
-    s->init_data->curbuf->multi_capable =
-            DetectEngineBufferTypeSupportsMultiInstanceGetById(de_ctx, list);
-    if (s->init_data->init_flags & SIG_FLAG_INIT_FORCE_TOCLIENT) {
-        s->init_data->curbuf->only_tc = true;
-    }
-    if (s->init_data->init_flags & SIG_FLAG_INIT_FORCE_TOSERVER) {
-        s->init_data->curbuf->only_ts = true;
-    }
-
-    SCLogDebug("new: idx %u list %d set up curbuf %p", s->init_data->buffer_index - 1, list,
-            s->init_data->curbuf);
-
-    return 0;
-}
-
-int DetectBufferGetActiveList(DetectEngineCtx *de_ctx, Signature *s)
-{
-    BUG_ON(s->init_data == NULL);
-
-    if (s->init_data->list && s->init_data->transforms.cnt) {
-        if (s->init_data->list == DETECT_SM_LIST_NOTSET ||
-            s->init_data->list < DETECT_SM_LIST_DYNAMIC_START) {
-            SCLogError("previous transforms not consumed "
-                       "(list: %u, transform_cnt %u)",
-                    s->init_data->list, s->init_data->transforms.cnt);
-            SCReturnInt(-1);
-        }
-
-        SCLogDebug("buffer %d has transform(s) registered: %d",
-                s->init_data->list, s->init_data->transforms.cnt);
-        int new_list = DetectEngineBufferTypeGetByIdTransforms(de_ctx, s->init_data->list,
-                s->init_data->transforms.transforms, s->init_data->transforms.cnt);
-        if (new_list == -1) {
-            SCReturnInt(-1);
-        }
-        int base_list = s->init_data->list;
-        SCLogDebug("new_list %d", new_list);
-        s->init_data->list = new_list;
-        s->init_data->list_set = false;
-        // reset transforms now that we've set up the list
-        s->init_data->transforms.cnt = 0;
-
-        if (s->init_data->curbuf && s->init_data->curbuf->head != NULL) {
-            if (SignatureInitDataBufferCheckExpand(s) < 0) {
-                SCLogError("failed to expand rule buffer array");
-                return -1;
-            }
-            s->init_data->curbuf = &s->init_data->buffers[s->init_data->buffer_index++];
-            s->init_data->curbuf->multi_capable =
-                    DetectEngineBufferTypeSupportsMultiInstanceGetById(de_ctx, base_list);
-        }
-        if (s->init_data->curbuf == NULL) {
-            SCLogError("failed to setup buffer");
-            DEBUG_VALIDATE_BUG_ON(1);
-            SCReturnInt(-1);
-        }
-        s->init_data->curbuf->id = new_list;
-        SCLogDebug("new list after applying transforms: %u", new_list);
-    }
-
-    SCReturnInt(0);
-}
-
 void InspectionBufferClean(DetectEngineThreadCtx *det_ctx)
 {
     /* single buffers */

diff --git a/src/detect-engine.h b/src/detect-engine.h
index cc6e55b526f499992d6f4b293676da8324f9aef5..f033c632ad83dbc947cb254b3f23ce090c7f7649 100644 (file)
--- a/src/detect-engine.h
+++ b/src/detect-engine.h
@@ -201,11 +201,6 @@ int DetectEngineMustParseMetadata(void);
 
 bool DetectBufferIsPresent(const Signature *s, const uint32_t buf_id);
 
-int WARN_UNUSED DetectBufferSetActiveList(DetectEngineCtx *de_ctx, Signature *s, const int list);
-int DetectBufferGetActiveList(DetectEngineCtx *de_ctx, Signature *s);
-SigMatch *DetectBufferGetFirstSigMatch(const Signature *s, const uint32_t buf_id);
-SigMatch *DetectBufferGetLastSigMatch(const Signature *s, const uint32_t buf_id);
-
 DetectEngineThreadCtx *DetectEngineThreadCtxInitForReload(
         ThreadVars *tv, DetectEngineCtx *new_de_ctx, int mt);
 

diff --git a/src/detect-entropy.c b/src/detect-entropy.c
index 31a1ac8481a3fc94805feccfca2f139300da5d9e..48e88f9fbd17da002f48960d39e1e130db923c58 100644 (file)
--- a/src/detect-entropy.c
+++ b/src/detect-entropy.c
@@ -20,6 +20,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 
 #include "detect-entropy.h"
 

diff --git a/src/detect-fast-pattern.c b/src/detect-fast-pattern.c
index 1a7a617f50931515c34c906603b9ec63c602b38a..19fdeba98adca3d5a41ccb3685c7912e01eeeac4 100644 (file)
--- a/src/detect-fast-pattern.c
+++ b/src/detect-fast-pattern.c
@@ -382,6 +382,7 @@ static int DetectFastPatternSetup(DetectEngineCtx *de_ctx, Signature *s, const c
 
 #ifdef UNITTESTS
 #include "detect-engine-alert.h"
+#include "detect-engine-buffer.h"
 static SigMatch *GetMatches(Signature *s, const int list)
 {
     SigMatch *sm = DetectBufferGetFirstSigMatch(s, list);

diff --git a/src/detect-file-data.c b/src/detect-file-data.c
index f1e17c853548767b4052eeaf8cf455b16f5bf46c..011b4c4f78dae6c686a593b566e8d0f8c67ea3a8 100644 (file)
--- a/src/detect-file-data.c
+++ b/src/detect-file-data.c
@@ -30,6 +30,7 @@
 #include "detect-parse.h"
 
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-filemagic.c b/src/detect-filemagic.c
index 77966ebd99e994e8b5b3bb97e537dda381bafce1..316320ba134b8139bc6a1c29437670e36ef672a8 100644 (file)
--- a/src/detect-filemagic.c
+++ b/src/detect-filemagic.c
@@ -31,6 +31,7 @@
 #include "detect-content.h"
 
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"

diff --git a/src/detect-filename.c b/src/detect-filename.c
index 65e0151e8bee0c95823a55b906fd192c33cfb12a..df9ba98d0c672925ba273b49867c1047f8f16ec3 100644 (file)
--- a/src/detect-filename.c
+++ b/src/detect-filename.c
@@ -30,6 +30,7 @@
 #include "detect.h"
 
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-file.h"

diff --git a/src/detect-frame.c b/src/detect-frame.c
index d2f7461f7579a53d102ba003866651d3578294b0..7e93b70267e6d2e126dc9415e4cfd6f8e9e2ac6f 100644 (file)
--- a/src/detect-frame.c
+++ b/src/detect-frame.c
@@ -29,6 +29,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-ftp-command-data.c b/src/detect-ftp-command-data.c
index 4bed3d7a406a34c465750e1cd2972fcd32c66b44..54553ce8f64d422f9809b1c15d560f5d2e44ab6d 100644 (file)
--- a/src/detect-ftp-command-data.c
+++ b/src/detect-ftp-command-data.c
@@ -28,6 +28,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-helper.h"

diff --git a/src/detect-ftp-command.c b/src/detect-ftp-command.c
index f06e46cccb772e93252f01e1d4cc22f81516cae1..521d0671f7fd8887a331473f28db87de64a3258b 100644 (file)
--- a/src/detect-ftp-command.c
+++ b/src/detect-ftp-command.c
@@ -28,6 +28,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-ftp-reply.c b/src/detect-ftp-reply.c
index 2c51e3b5f8d99c49892ade4aea4703e49982f1ea..1fd7a9a4635869b6c3191743ed8ff7649a769cd2 100644 (file)
--- a/src/detect-ftp-reply.c
+++ b/src/detect-ftp-reply.c
@@ -28,6 +28,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-helper.h"
 #include "detect-engine-content-inspection.h"
 #include "detect-ftp-reply.h"

diff --git a/src/detect-http-client-body.c b/src/detect-http-client-body.c
index 35f8b976e977753a26b704f566362c5740667bed..00ed170ee55301c9de11025f4de284b2dedd1eda 100644 (file)
--- a/src/detect-http-client-body.c
+++ b/src/detect-http-client-body.c
@@ -37,6 +37,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-http-cookie.c b/src/detect-http-cookie.c
index c6532b92c4b70ca2e1490696166b0990e87bc2ca..f56c28567be15f1c64107e60e2c4e2336ed24ed8 100644 (file)
--- a/src/detect-http-cookie.c
+++ b/src/detect-http-cookie.c
@@ -37,6 +37,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-http-header-names.c b/src/detect-http-header-names.c
index c748c70f1c2fd2f649d8e79f6563ddc9460c6f48..3eb5406e4171c49a4eecc4a2db1b806e67ac3f27 100644 (file)
--- a/src/detect-http-header-names.c
+++ b/src/detect-http-header-names.c
@@ -37,6 +37,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-http-header.c b/src/detect-http-header.c
index 938a9049d755b4333d67bf23d1fb3eabd6ef9a48..3efcc16f10bb6193076c52bface4c2a0f7321d6f 100644 (file)
--- a/src/detect-http-header.c
+++ b/src/detect-http-header.c
@@ -37,6 +37,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-http-headers-stub.h b/src/detect-http-headers-stub.h
index 529dca5ad5ae3d78b5daacc396beb528444c7d74..2dafa0d82b288105add71eca35cba23cf49d3e94 100644 (file)
--- a/src/detect-http-headers-stub.h
+++ b/src/detect-http-headers-stub.h
@@ -34,6 +34,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 

diff --git a/src/detect-http-host.c b/src/detect-http-host.c
index 89a7708931ac853707a0403a3feb712a9ee07ed5..4f107945e492c4feeb75bb2db73caecb16f2bf13 100644 (file)
--- a/src/detect-http-host.c
+++ b/src/detect-http-host.c
@@ -37,6 +37,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-http-method.c b/src/detect-http-method.c
index 74eb7977c8cb154e96b6cc048c7680b9101ce516..52e10138c73e8c989caf398c1ffe9ac1fde57c3a 100644 (file)
--- a/src/detect-http-method.c
+++ b/src/detect-http-method.c
@@ -37,6 +37,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-http-protocol.c b/src/detect-http-protocol.c
index d7c28bfb29647efd4d85906eb7bd340ed71f8406..56eb2e2a533d7299e03fd36da6a29dc19804019c 100644 (file)
--- a/src/detect-http-protocol.c
+++ b/src/detect-http-protocol.c
@@ -37,6 +37,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-http-raw-header.c b/src/detect-http-raw-header.c
index 0b4adef6fa62374c007fdd1b683de644ffb136d0..5f6e38b6fe712559ef750929db9c716b033afbda 100644 (file)
--- a/src/detect-http-raw-header.c
+++ b/src/detect-http-raw-header.c
@@ -37,6 +37,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-http-request-line.c b/src/detect-http-request-line.c
index 768d28f6ca6c52b8b5d33f15a05d69eeab03f0ca..2edd79aef1080f3829520471af1caea80339f3d8 100644 (file)
--- a/src/detect-http-request-line.c
+++ b/src/detect-http-request-line.c
@@ -37,6 +37,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-http-response-line.c b/src/detect-http-response-line.c
index 6eb86445fdcaeff50af7c0feab969fc0bc0a7dd5..72a5eda92de566a7eb470d0cf868e3516d2ff59f 100644 (file)
--- a/src/detect-http-response-line.c
+++ b/src/detect-http-response-line.c
@@ -37,6 +37,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-http-server-body.c b/src/detect-http-server-body.c
index 6ef4594ec94e41f8fe4c69123d518d609aefe7a2..6cdb639944dd2c392f635ca1a05a2f97c0136c1d 100644 (file)
--- a/src/detect-http-server-body.c
+++ b/src/detect-http-server-body.c
@@ -38,6 +38,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-content-inspection.h"
 #include "detect-content.h"
 

diff --git a/src/detect-http-start.c b/src/detect-http-start.c
index 4a6101056242af62270397cf338a9a0e1d3b172a..85d9a493de0ef33b7e0e93afa74cf87f37b3bccd 100644 (file)
--- a/src/detect-http-start.c
+++ b/src/detect-http-start.c
@@ -36,6 +36,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-http-stat-code.c b/src/detect-http-stat-code.c
index 8ffddc74f520d9f0e5b06a4e8a2db28b479eceb4..646bb8d19ae6f4d025575f9c8f555042f74d3135 100644 (file)
--- a/src/detect-http-stat-code.c
+++ b/src/detect-http-stat-code.c
@@ -38,6 +38,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-content.h"
 #include "detect-pcre.h"
 #include "detect-engine-mpm.h"

diff --git a/src/detect-http-stat-msg.c b/src/detect-http-stat-msg.c
index 93640df97ecfce6b1f67c11c314f873115df0984..8f3ba31280352de4a590835bad70868ab4ccc194 100644 (file)
--- a/src/detect-http-stat-msg.c
+++ b/src/detect-http-stat-msg.c
@@ -38,6 +38,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-content.h"
 #include "detect-pcre.h"
 #include "detect-engine-mpm.h"

diff --git a/src/detect-http-ua.c b/src/detect-http-ua.c
index 90f31c4a1e500f19cb9161b2d00cd28a0fb0a836..0a3a544be2e8c6a05c4005aad96b00172ec1eb60 100644 (file)
--- a/src/detect-http-ua.c
+++ b/src/detect-http-ua.c
@@ -37,6 +37,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-http-uri.c b/src/detect-http-uri.c
index 0d9c03adf9eace57dd2e18032f3f3b0cd98165ad..d90ca641ecd76ae80640e9f9dc2b96ea6196805a 100644 (file)
--- a/src/detect-http-uri.c
+++ b/src/detect-http-uri.c
@@ -36,6 +36,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-http2.c b/src/detect-http2.c
index aea75be824181f0fce4034008166759ee7c8906d..28585dc86d8f8ba5a5ce692d5db1330cd17b6098 100644 (file)
--- a/src/detect-http2.c
+++ b/src/detect-http2.c
@@ -29,6 +29,7 @@
 #include "detect-content.h"
 
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-uint.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-icmpv4hdr.c b/src/detect-icmpv4hdr.c
index 43a884991555f82943551d6adbb3a6e6a90c6adf..c70d88f911e2d72c87cdbdd5dd18a380d364fc63 100644 (file)
--- a/src/detect-icmpv4hdr.c
+++ b/src/detect-icmpv4hdr.c
@@ -26,6 +26,7 @@
 
 #include "detect.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-icmpv4hdr.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-icmpv6hdr.c b/src/detect-icmpv6hdr.c
index 0bd9b2b4fc71beaf2ceacff3427b511b249e322c..31331328c1d4c66cb871f517820610e22373f576 100644 (file)
--- a/src/detect-icmpv6hdr.c
+++ b/src/detect-icmpv6hdr.c
@@ -27,6 +27,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"

diff --git a/src/detect-ike-key-exchange-payload.c b/src/detect-ike-key-exchange-payload.c
index fadad07f28ea70d4893953a67ac114ebee262373..6de0180dd9d63e14369b8f92c70f0ef440c166c8 100644 (file)
--- a/src/detect-ike-key-exchange-payload.c
+++ b/src/detect-ike-key-exchange-payload.c
@@ -27,6 +27,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-urilen.h"

diff --git a/src/detect-ike-nonce-payload.c b/src/detect-ike-nonce-payload.c
index 20c28585dd1234265c98449f24b154fcdb55e06b..5de3dbc27ee711edaca246770f1cf63644a4c28f 100644 (file)
--- a/src/detect-ike-nonce-payload.c
+++ b/src/detect-ike-nonce-payload.c
@@ -27,6 +27,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-urilen.h"

diff --git a/src/detect-ike-spi.c b/src/detect-ike-spi.c
index 52bc97b0687c412e7c4e3536f1b5eaf95dd89992..9f1311c85be25928ecdea3cdc4d02ed8a4b87442 100644 (file)
--- a/src/detect-ike-spi.c
+++ b/src/detect-ike-spi.c
@@ -27,6 +27,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-urilen.h"

diff --git a/src/detect-ike-vendor.c b/src/detect-ike-vendor.c
index 6042461dd323ba1dcb3cf014d32d6ce4b44c5a1d..0097b37a9c4e9895e96fb7da5adcfe88951877c9 100644 (file)
--- a/src/detect-ike-vendor.c
+++ b/src/detect-ike-vendor.c
@@ -25,6 +25,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"
 #include "detect-engine-mpm.h"

diff --git a/src/detect-ipv4hdr.c b/src/detect-ipv4hdr.c
index 1db2bf0f28d6a90538127f89b6a21305f8fb5744..a9a5ed1baa80bf5f0c56506baad019d2d42b35ca 100644 (file)
--- a/src/detect-ipv4hdr.c
+++ b/src/detect-ipv4hdr.c
@@ -27,6 +27,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"

diff --git a/src/detect-ipv6hdr.c b/src/detect-ipv6hdr.c
index 28a61023e21c077be06b0759e4bf822cb91c8048..32c7f3cc715602eb61dcfdc6301314e05043dc38 100644 (file)
--- a/src/detect-ipv6hdr.c
+++ b/src/detect-ipv6hdr.c
@@ -27,6 +27,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"

diff --git a/src/detect-isdataat.c b/src/detect-isdataat.c
index 6bc4e961c07ad03acdce8b63cb871539b92ba757..818704330854fd01ca50bed2a811e81a203b77a9 100644 (file)
--- a/src/detect-isdataat.c
+++ b/src/detect-isdataat.c
@@ -27,6 +27,7 @@
 #include "decode.h"
 #include "detect.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-parse.h"
 #include "app-layer.h"
 

diff --git a/src/detect-ja4-hash.c b/src/detect-ja4-hash.c
index 645c6eba54a7be44ff4cceade0d613ae4786a29e..5e08e7a09337ebfc97112565d3b1bb3b3b9601d3 100644 (file)
--- a/src/detect-ja4-hash.c
+++ b/src/detect-ja4-hash.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-ja4-hash.h"

diff --git a/src/detect-krb5-cname.c b/src/detect-krb5-cname.c
index dbd828669b32ed2f72f22375abe8cbeb05d0f7de..647bf9f1d8c55af6aa5b0485c7af37389992a87c 100644 (file)
--- a/src/detect-krb5-cname.c
+++ b/src/detect-krb5-cname.c
@@ -26,6 +26,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-krb5-sname.c b/src/detect-krb5-sname.c
index a806803fb3282eb40bc215f3ff83391644b3f881..9510f493f8fea412f84125a4a311a5efa1102cac 100644 (file)
--- a/src/detect-krb5-sname.c
+++ b/src/detect-krb5-sname.c
@@ -26,6 +26,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-lua.c b/src/detect-lua.c
index 9137afeba1ba2946c14b7810ff5c260266d36a12..2854ae5cec154f22c6195ce9f4aaabbd70425979 100644 (file)
--- a/src/detect-lua.c
+++ b/src/detect-lua.c
@@ -31,6 +31,7 @@
 #include "detect-parse.h"
 
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-build.h"
 

diff --git a/src/detect-pcre.c b/src/detect-pcre.c
index 435ffc0628318d455265e6752ed68af766a3bbf4..e46ffc21adcda276e5d66e1d2e680c9e27ef7a15 100644 (file)
--- a/src/detect-pcre.c
+++ b/src/detect-pcre.c
@@ -37,6 +37,7 @@
 #include "detect-parse.h"
 #include "detect-content.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-sigorder.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"

diff --git a/src/detect-quic-cyu-hash.c b/src/detect-quic-cyu-hash.c
index 2cb9a31740bf9da5e209dbf9ca3d7bf0be561c7f..86ec9559a70fb23cae3415a145eda049754c01fc 100644 (file)
--- a/src/detect-quic-cyu-hash.c
+++ b/src/detect-quic-cyu-hash.c
@@ -26,6 +26,7 @@
 #include "detect-content.h"
 
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"

diff --git a/src/detect-quic-cyu-string.c b/src/detect-quic-cyu-string.c
index 6dbb45684ffdb013f1fc2881abbfa4dd7a710141..514abb964655bc28dd837e3d6869e5e7f87c3700 100644 (file)
--- a/src/detect-quic-cyu-string.c
+++ b/src/detect-quic-cyu-string.c
@@ -24,6 +24,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"

diff --git a/src/detect-quic-sni.c b/src/detect-quic-sni.c
index 5f5142727c4b25d912b2569bd90bf2e1f1a811ee..0623d0f59cc215fc1ca1ae0403e4c8e7d03a1412 100644 (file)
--- a/src/detect-quic-sni.c
+++ b/src/detect-quic-sni.c
@@ -25,6 +25,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-content-inspection.h"

diff --git a/src/detect-quic-ua.c b/src/detect-quic-ua.c
index 732d79dbac04612b88adda0a0cfe7e33507d1fec..a32a46cdfb0e631e3ebcbc0c9769b99d28928f30 100644 (file)
--- a/src/detect-quic-ua.c
+++ b/src/detect-quic-ua.c
@@ -25,6 +25,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-content-inspection.h"

diff --git a/src/detect-quic-version.c b/src/detect-quic-version.c
index 2d40becf3d506dca5a4ed97d5d50e97f8f8884ef..f06a22dda395b2a80596ba4e2f30c15a8f277bd1 100644 (file)
--- a/src/detect-quic-version.c
+++ b/src/detect-quic-version.c
@@ -25,6 +25,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-content-inspection.h"

diff --git a/src/detect-sip-method.c b/src/detect-sip-method.c
index 2c0eeeee4891d2aa2e31ef55adcfa8e316411378..f99b303d9fc087620a3072b3535ff8b4069c7fde 100644 (file)
--- a/src/detect-sip-method.c
+++ b/src/detect-sip-method.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-sip-uri.c b/src/detect-sip-uri.c
index cd78cd12c5b1f9ed2f28fb6ee089d97f490382c9..cd0b00ae8398250931850289e6b3d87eef036459 100644 (file)
--- a/src/detect-sip-uri.c
+++ b/src/detect-sip-uri.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-smb-ntlmssp.c b/src/detect-smb-ntlmssp.c
index 644704400eecbc36c8992e84f7a819d18a0f7160..9a59d5bda947c86de6928a0b593a0b8175876bbb 100644 (file)
--- a/src/detect-smb-ntlmssp.c
+++ b/src/detect-smb-ntlmssp.c
@@ -29,6 +29,7 @@
 #include "detect-parse.h"
 
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-smb-share.c b/src/detect-smb-share.c
index 22a3e72f99de9d69c8793aa065d987e646b18883..d81b3473cc1a99ea0adfc929ec34878044c753e3 100644 (file)
--- a/src/detect-smb-share.c
+++ b/src/detect-smb-share.c
@@ -28,6 +28,7 @@
 #include "detect-parse.h"
 
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-smtp.c b/src/detect-smtp.c
index 1a5aa03b42969e40659ee0aef8c4d4e62f01dd0c..724b36d128c18b9c31b62cbfcbce91953babfc36 100644 (file)
--- a/src/detect-smtp.c
+++ b/src/detect-smtp.c
@@ -25,6 +25,7 @@
 #include "suricata-common.h"
 #include "detect-smtp.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-content-inspection.h"
 #include "detect-engine-helper.h"
 #include "detect-parse.h"

diff --git a/src/detect-ssh-hassh-server-string.c b/src/detect-ssh-hassh-server-string.c
index 287846a8864f94dadbbd6cecb02f2764f8edc77e..b84687bfe3fe5d4e0c7740480a971a229899c310 100644 (file)
--- a/src/detect-ssh-hassh-server-string.c
+++ b/src/detect-ssh-hassh-server-string.c
@@ -29,6 +29,7 @@
 #include "detect-parse.h"
 
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-ssh-hassh-server.c b/src/detect-ssh-hassh-server.c
index 448aa1b2a60bbd4a2ddfb4348b69798b12a83a98..719473ad2959a06d9d5f881373b79aa50d2a700d 100644 (file)
--- a/src/detect-ssh-hassh-server.c
+++ b/src/detect-ssh-hassh-server.c
@@ -30,6 +30,7 @@
 #include "detect-content.h"
 
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-ssh-hassh-string.c b/src/detect-ssh-hassh-string.c
index f55c20d9f42779d547e854aaaa7f8f88218da254..c177e33180540ba6ff707580fbf4f701cdc83505 100644 (file)
--- a/src/detect-ssh-hassh-string.c
+++ b/src/detect-ssh-hassh-string.c
@@ -29,6 +29,7 @@
 #include "detect-parse.h"
 
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-ssh-hassh.c b/src/detect-ssh-hassh.c
index e3593b9073659cdafb2184312d10f4f9608149f9..04b8f4b3c98f54c6e4fb6447e549e3076cdcbf19 100644 (file)
--- a/src/detect-ssh-hassh.c
+++ b/src/detect-ssh-hassh.c
@@ -30,6 +30,7 @@
 #include "detect-content.h"
 
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-ssh-proto.c b/src/detect-ssh-proto.c
index b25e57db8d26113ef9b21e2b4776920ddee2d169..48b5b23b806e0f6c3f0b7662c0172b82c5aa56b7 100644 (file)
--- a/src/detect-ssh-proto.c
+++ b/src/detect-ssh-proto.c
@@ -37,6 +37,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-ssh-software.c b/src/detect-ssh-software.c
index c0d36c06f24a754a3bd2209f701a8bcf496f54df..77d70af1a57c77b1fa879d4b0014a7a4a92fb0ed 100644 (file)
--- a/src/detect-ssh-software.c
+++ b/src/detect-ssh-software.c
@@ -37,6 +37,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"

diff --git a/src/detect-tcphdr.c b/src/detect-tcphdr.c
index 920bdd798bed06045bb633fe06ab2aa351435bc8..aba3f871ae33f253907e1e70920154cb7215b03c 100644 (file)
--- a/src/detect-tcphdr.c
+++ b/src/detect-tcphdr.c
@@ -27,6 +27,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"

diff --git a/src/detect-tls-alpn.c b/src/detect-tls-alpn.c
index dfa6fb440849b7499cc5d22b707c03c4add97730..8f7563cf4d967dcbf79f82ba793cede9535fd4fb 100644 (file)
--- a/src/detect-tls-alpn.c
+++ b/src/detect-tls-alpn.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"

diff --git a/src/detect-tls-cert-fingerprint.c b/src/detect-tls-cert-fingerprint.c
index 3500c5f90aba4b5c132f1daa718894dc7cea0137..c01887fade5b6ca1e57afb94a228eb0b26e4e36f 100644 (file)
--- a/src/detect-tls-cert-fingerprint.c
+++ b/src/detect-tls-cert-fingerprint.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-tls-cert-issuer.c b/src/detect-tls-cert-issuer.c
index 340abf2fab56d4ea238fb419391ccc9142d02c20..fd3d4aa9242a076bb6504c7e3ab6c9c8c8a329fc 100644 (file)
--- a/src/detect-tls-cert-issuer.c
+++ b/src/detect-tls-cert-issuer.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-tls-cert-serial.c b/src/detect-tls-cert-serial.c
index f022170427a31f1995ef6d87f930611e3142dfb5..1df78297b6c598851b9c9dd274a5c19f14b17385 100644 (file)
--- a/src/detect-tls-cert-serial.c
+++ b/src/detect-tls-cert-serial.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-tls-cert-subject.c b/src/detect-tls-cert-subject.c
index 55dc976e240995f491f8afca280e9417d5c3fcd7..96e50006d4bd2d4faf5217ff85b1cf536bba7d55 100644 (file)
--- a/src/detect-tls-cert-subject.c
+++ b/src/detect-tls-cert-subject.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-tls-certs.c b/src/detect-tls-certs.c
index 197ce42bdf07291023c268910895b53a14765ae0..aa8a86318ffc6692065b771898463dd4a3cc809c 100644 (file)
--- a/src/detect-tls-certs.c
+++ b/src/detect-tls-certs.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"

diff --git a/src/detect-tls-ja3-hash.c b/src/detect-tls-ja3-hash.c
index f4d7154d0343f91b97931d618b20b196fd18e21f..2b412c3e964b12387736843d92223536132ebe16 100644 (file)
--- a/src/detect-tls-ja3-hash.c
+++ b/src/detect-tls-ja3-hash.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-tls-ja3-string.c b/src/detect-tls-ja3-string.c
index 81b44c42fc6eac0acb5dbdbaed0c619c83f1d615..a831ad46bc5c5d4270f170795a9972a23ef1cada 100644 (file)
--- a/src/detect-tls-ja3-string.c
+++ b/src/detect-tls-ja3-string.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-tls-ja3s-hash.c b/src/detect-tls-ja3s-hash.c
index 2bec72516924a69ceedcbce5bd5390f578a904ac..48397b1cd3c383c29cd8c2deb238b4f673d58fd0 100644 (file)
--- a/src/detect-tls-ja3s-hash.c
+++ b/src/detect-tls-ja3s-hash.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-tls-ja3s-string.c b/src/detect-tls-ja3s-string.c
index 857e045f7d4d3c1733592e35513f65453be16f87..ba8f7bda185ad57a9b832574f38e2e9b551b5cd5 100644 (file)
--- a/src/detect-tls-ja3s-string.c
+++ b/src/detect-tls-ja3s-string.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-content.h"

diff --git a/src/detect-tls-random.c b/src/detect-tls-random.c
index 76e6049069873311584e1f0b7b5d9cfb14bdfbea..abc850cd0f4ef334f9c124ec55b1a329228dfa1e 100644 (file)
--- a/src/detect-tls-random.c
+++ b/src/detect-tls-random.c
@@ -21,6 +21,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-content.h"
 

diff --git a/src/detect-tls-sni.c b/src/detect-tls-sni.c
index 7905e67c59250fe5117e767fbed53ca66471d78c..73cc6307233e8d271a7c1cb327468dc2655c77e4 100644 (file)
--- a/src/detect-tls-sni.c
+++ b/src/detect-tls-sni.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-content.h"
 #include "detect-pcre.h"

diff --git a/src/detect-tls-subjectaltname.c b/src/detect-tls-subjectaltname.c
index ef0aafc3aa3f0b36ecc51a4243fe793ff28be733..7bb601c850fa2f15d6dad40ee9652df63f0089b8 100644 (file)
--- a/src/detect-tls-subjectaltname.c
+++ b/src/detect-tls-subjectaltname.c
@@ -30,6 +30,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"

diff --git a/src/detect-udphdr.c b/src/detect-udphdr.c
index 0e604104a8b569df41de5bccdd2f1351e72129f4..048e7abb1839d37361f84481ae8dc05aa053381c 100644 (file)
--- a/src/detect-udphdr.c
+++ b/src/detect-udphdr.c
@@ -27,6 +27,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-buffer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"