detect: pass de_ctx to DetectBufferSetActiveList

diff --git a/src/detect-dce-stub-data.c b/src/detect-dce-stub-data.c
index 44133a7bf01f8a84a3de05e208f7a3655eaef969..50d0387b0758170d9ae772af53d3d6a550a86364 100644 (file)
--- a/src/detect-dce-stub-data.c
+++ b/src/detect-dce-stub-data.c
@@ -173,7 +173,7 @@ static int DetectDceStubDataSetup(DetectEngineCtx *de_ctx, Signature *s, const c
 {
     if (DetectSignatureSetAppProto(s, ALPROTO_DCERPC) < 0)
         return -1;
-    if (DetectBufferSetActiveList(s, g_dce_stub_data_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_dce_stub_data_buffer_id) < 0)
         return -1;
     return 0;
 }

diff --git a/src/detect-dnp3.c b/src/detect-dnp3.c
index b236950ab8ebc44c669e21377c0e1c0bace98086..e8f2c052ae973b6015a865958bfe711a5d0b6d1f 100644 (file)
--- a/src/detect-dnp3.c
+++ b/src/detect-dnp3.c
@@ -534,7 +534,7 @@ static int DetectDNP3DataSetup(DetectEngineCtx *de_ctx, Signature *s, const char
     if (DetectSignatureSetAppProto(s, ALPROTO_DNP3) != 0)
         return -1;
 
-    if (DetectBufferSetActiveList(s, g_dnp3_data_buffer_id) != 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_dnp3_data_buffer_id) != 0)
         return -1;
 
     SCReturnInt(0);

diff --git a/src/detect-dns-query.c b/src/detect-dns-query.c
index 045b51e98ab86e154a9347067420e798f9aada90..67ec7aba9b6f037ae7e36703728edbfaddbadd86 100644 (file)
--- a/src/detect-dns-query.c
+++ b/src/detect-dns-query.c
@@ -253,7 +253,7 @@ void DetectDnsQueryRegister (void)
 
 static int DetectDnsQuerySetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_dns_query_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_dns_query_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_DNS) < 0)
         return -1;

diff --git a/src/detect-engine.c b/src/detect-engine.c
index 5913400eafea53c54a6bcfb097d74e34daf78054..769b9852b597f3461365610ffbce27d74dc70352 100644 (file)
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -1317,7 +1317,7 @@ bool DetectBufferIsPresent(const Signature *s, const uint32_t buf_id)
     return false;
 }
 
-int DetectBufferSetActiveList(Signature *s, const int list)
+int DetectBufferSetActiveList(DetectEngineCtx *de_ctx, Signature *s, const int list)
 {
     BUG_ON(s->init_data == NULL);
 

diff --git a/src/detect-engine.h b/src/detect-engine.h
index 7a790db74921a9f5281642e4a24a8b9789b6d048..848aa4abb5d8e8c34303f7aeb5458a37ccabd046 100644 (file)
--- a/src/detect-engine.h
+++ b/src/detect-engine.h
@@ -184,7 +184,11 @@ void DetectEngineSetParseMetadata(void);
 void DetectEngineUnsetParseMetadata(void);
 int DetectEngineMustParseMetadata(void);
 
-int WARN_UNUSED DetectBufferSetActiveList(Signature *s, const int list);
+SigMatch *DetectBufferGetFirstSigMatch(const Signature *s, const uint32_t buf_id);
+SigMatch *DetectBufferGetLastSigMatch(const Signature *s, const uint32_t buf_id);
+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);

diff --git a/src/detect-file-data.c b/src/detect-file-data.c
index 2d3cc1561dcdfa9eb31534d07d7b90fe1ccb40f8..c81e5bb650f2c2eab3ed194d716bd069af2e6046 100644 (file)
--- a/src/detect-file-data.c
+++ b/src/detect-file-data.c
@@ -216,7 +216,7 @@ static int DetectFiledataSetup (DetectEngineCtx *de_ctx, Signature *s, const cha
         return -1;
     }
 
-    if (DetectBufferSetActiveList(s, DetectBufferTypeGetByName("file_data")) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, DetectBufferTypeGetByName("file_data")) < 0)
         return -1;
 
     s->init_data->init_flags |= SIG_FLAG_INIT_FILEDATA;

diff --git a/src/detect-filemagic.c b/src/detect-filemagic.c
index 29ecde687ce36abbe87de5358ab1bb5930b97345..e68d659d64b25c89d221e0d74ef08570f81e468b 100644 (file)
--- a/src/detect-filemagic.c
+++ b/src/detect-filemagic.c
@@ -428,7 +428,7 @@ static void DetectFilemagicFree(DetectEngineCtx *de_ctx, void *ptr)
  */
 static int DetectFilemagicSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_file_magic_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_file_magic_buffer_id) < 0)
         return -1;
 
     if (g_magic_thread_ctx_id == -1) {

diff --git a/src/detect-filename.c b/src/detect-filename.c
index 5ca1cc88cae35035597f3011a9c1b3dea5accc71..e38754f7d3201ea9921d54ef9020a361d4731dd6 100644 (file)
--- a/src/detect-filename.c
+++ b/src/detect-filename.c
@@ -344,7 +344,7 @@ static void DetectFilenameFree(DetectEngineCtx *de_ctx, void *ptr)
  */
 static int DetectFilenameSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_file_name_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_file_name_buffer_id) < 0)
         return -1;
     s->file_flags |= (FILE_SIG_NEED_FILE | FILE_SIG_NEED_FILENAME);
     return 0;

diff --git a/src/detect-frame.c b/src/detect-frame.c
index c74c145a078831488449f42e3222b54732569c0a..d2f7461f7579a53d102ba003866651d3578294b0 100644 (file)
--- a/src/detect-frame.c
+++ b/src/detect-frame.c
@@ -138,7 +138,7 @@ static int DetectFrameSetup(DetectEngineCtx *de_ctx, Signature *s, const char *s
     if (buffer_id < 0)
         return -1;
 
-    if (DetectBufferSetActiveList(s, buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, buffer_id) < 0)
         return -1;
 
     FrameConfigEnable(keyword_alproto, frame_type);

diff --git a/src/detect-http-client-body.c b/src/detect-http-client-body.c
index 9bb08d5cdf83e18607cf8da398152799ba6391f0..7b90191b32a5646afba53079b6b7cc4de962ebc7 100644 (file)
--- a/src/detect-http-client-body.c
+++ b/src/detect-http-client-body.c
@@ -156,7 +156,7 @@ int DetectHttpClientBodySetup(DetectEngineCtx *de_ctx, Signature *s, const char
  */
 static int DetectHttpClientBodySetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_http_client_body_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http_client_body_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP1) < 0)
         return -1;

diff --git a/src/detect-http-cookie.c b/src/detect-http-cookie.c
index ee3b85daa5092c867b4fa49671bea15cfc856fd9..e2754138fd446c8a4c66ac627c515d4c076c9d26 100644 (file)
--- a/src/detect-http-cookie.c
+++ b/src/detect-http-cookie.c
@@ -160,7 +160,7 @@ static int DetectHttpCookieSetup(DetectEngineCtx *de_ctx, Signature *s, const ch
  */
 static int DetectHttpCookieSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_http_cookie_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http_cookie_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0)

diff --git a/src/detect-http-header-names.c b/src/detect-http-header-names.c
index eb9e4f117c1243426c16adb445063f305ef50a22..58989a1825df7017f703533a020351b87cca28e3 100644 (file)
--- a/src/detect-http-header-names.c
+++ b/src/detect-http-header-names.c
@@ -196,7 +196,7 @@ static InspectionBuffer *GetBuffer2ForTX(DetectEngineThreadCtx *det_ctx,
  */
 static int DetectHttpHeaderNamesSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0)

diff --git a/src/detect-http-header.c b/src/detect-http-header.c
index f9a24d63d31db0023e682cfb25f60c2fb57a4dfb..6747aee50c87e77fa1f4034d6fe139ef6ee1d7fd 100644 (file)
--- a/src/detect-http-header.c
+++ b/src/detect-http-header.c
@@ -404,7 +404,7 @@ static int DetectHttpHeaderSetup(DetectEngineCtx *de_ctx, Signature *s, const ch
  */
 static int DetectHttpHeaderSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_http_header_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http_header_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0)
         return -1;

diff --git a/src/detect-http-headers-stub.h b/src/detect-http-headers-stub.h
index ef3712b6714e222f5ad233e6a49665b5ea144cbb..3a036d62209e96939b1878d53814e59e956c3e8e 100644 (file)
--- a/src/detect-http-headers-stub.h
+++ b/src/detect-http-headers-stub.h
@@ -165,7 +165,7 @@ static InspectionBuffer *GetResponseData2(DetectEngineThreadCtx *det_ctx,
  */
 static int DetectHttpHeadersSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0)

diff --git a/src/detect-http-host.c b/src/detect-http-host.c
index 982d2327f2685879767cb53c287641337e57f49c..8db78f6dc4a6fbfd2c951c91571cd71f63b490e7 100644 (file)
--- a/src/detect-http-host.c
+++ b/src/detect-http-host.c
@@ -223,7 +223,7 @@ static bool DetectHttpHostValidateCallback(const Signature *s, const char **sige
  */
 static int DetectHttpHostSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_http_host_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http_host_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0)
         return -1;
@@ -323,7 +323,7 @@ int DetectHttpHRHSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
  */
 static int DetectHttpHostRawSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_http_raw_host_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http_raw_host_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0)
         return -1;

diff --git a/src/detect-http-method.c b/src/detect-http-method.c
index 7eb9ac7f5e4abc19578241e46022cf769777bb5f..7b8dbc3c26604ef24794b4c9bdd606e57e6f08a8 100644 (file)
--- a/src/detect-http-method.c
+++ b/src/detect-http-method.c
@@ -148,7 +148,7 @@ static int DetectHttpMethodSetup(DetectEngineCtx *de_ctx, Signature *s, const ch
  */
 static int DetectHttpMethodSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_http_method_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http_method_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0)

diff --git a/src/detect-http-protocol.c b/src/detect-http-protocol.c
index 162066ebeea6d8098a09981f79e1c18f71ca0dd4..809dc20d71c17438516d2edbd345a23d99736766 100644 (file)
--- a/src/detect-http-protocol.c
+++ b/src/detect-http-protocol.c
@@ -72,7 +72,7 @@ static int g_buffer_id = 0;
 
 static int DetectHttpProtocolSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP1) < 0)

diff --git a/src/detect-http-raw-header.c b/src/detect-http-raw-header.c
index 78e31b134293319306c3e20618bb425c5fe4ae88..341c7f28a4ec32b1c532d2aeda37054ddb0c1cd6 100644 (file)
--- a/src/detect-http-raw-header.c
+++ b/src/detect-http-raw-header.c
@@ -158,7 +158,7 @@ int DetectHttpRawHeaderSetup(DetectEngineCtx *de_ctx, Signature *s, const char *
  */
 static int DetectHttpRawHeaderSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_http_raw_header_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http_raw_header_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0)
         return -1;

diff --git a/src/detect-http-request-line.c b/src/detect-http-request-line.c
index 106374dac88aa5986c6fbc4e2ca170bc33879b23..2dc64c644c2159663ca6c70f8e91874dd96d6034 100644 (file)
--- a/src/detect-http-request-line.c
+++ b/src/detect-http-request-line.c
@@ -113,7 +113,7 @@ void DetectHttpRequestLineRegister(void)
  */
 static int DetectHttpRequestLineSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_http_request_line_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http_request_line_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP1) < 0)

diff --git a/src/detect-http-response-line.c b/src/detect-http-response-line.c
index 4c297ad9776917fecd7e91a90ac10df0b1c6b724..2965c5b48b3876c0a076512368cd40950bf2de3c 100644 (file)
--- a/src/detect-http-response-line.c
+++ b/src/detect-http-response-line.c
@@ -112,7 +112,7 @@ void DetectHttpResponseLineRegister(void)
  */
 static int DetectHttpResponseLineSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_http_response_line_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http_response_line_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP1) < 0)

diff --git a/src/detect-http-server-body.c b/src/detect-http-server-body.c
index 1b6aff7c4da4cc95625844ec0441425cf9899fc0..4c5896bb82bd2478fe6d04db4f0c00fb803a5d92 100644 (file)
--- a/src/detect-http-server-body.c
+++ b/src/detect-http-server-body.c
@@ -124,7 +124,7 @@ int DetectHttpServerBodySetup(DetectEngineCtx *de_ctx, Signature *s, const char
  */
 static int DetectHttpServerBodySetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_file_data_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_file_data_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP1) < 0)
         return -1;

diff --git a/src/detect-http-start.c b/src/detect-http-start.c
index c13d1fcb09473b487f7ca997c1ca0b563fc1a92b..fed1abc96256e646ca8ed1772705cd29b601b647 100644 (file)
--- a/src/detect-http-start.c
+++ b/src/detect-http-start.c
@@ -167,7 +167,7 @@ static InspectionBuffer *GetBuffer1ForTX(DetectEngineThreadCtx *det_ctx,
 
 static int DetectHttpStartSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP1) < 0)

diff --git a/src/detect-http-stat-code.c b/src/detect-http-stat-code.c
index ec62f9c568ca89aa102ba2c7aeb69a149f1cc2db..1e7087a318b3ecdc62f4edf0e2a806f2a573e646 100644 (file)
--- a/src/detect-http-stat-code.c
+++ b/src/detect-http-stat-code.c
@@ -144,7 +144,7 @@ static int DetectHttpStatCodeSetup(DetectEngineCtx *de_ctx, Signature *s, const
  */
 static int DetectHttpStatCodeSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_http_stat_code_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http_stat_code_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0)
         return -1;

diff --git a/src/detect-http-stat-msg.c b/src/detect-http-stat-msg.c
index c2be938cc9bb7b2781bfa9edff1b28201a48ed8d..2c3b6720170d693ce821d951bc51fb74ffedbc8b 100644 (file)
--- a/src/detect-http-stat-msg.c
+++ b/src/detect-http-stat-msg.c
@@ -135,7 +135,7 @@ static int DetectHttpStatMsgSetup(DetectEngineCtx *de_ctx, Signature *s, const c
  */
 static int DetectHttpStatMsgSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_http_stat_msg_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http_stat_msg_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP1) < 0)
         return -1;

diff --git a/src/detect-http-ua.c b/src/detect-http-ua.c
index b954018f19426fd454e4e6a3bea84871fa1b5979..7138cf93fea47819de4372fa621ba1e97af03fb7 100644 (file)
--- a/src/detect-http-ua.c
+++ b/src/detect-http-ua.c
@@ -146,7 +146,7 @@ int DetectHttpUASetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
  */
 static int DetectHttpUserAgentSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_http_ua_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http_ua_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0)
         return -1;

diff --git a/src/detect-http-uri.c b/src/detect-http-uri.c
index 09aa55e7f4cc2a194377ac74a071d74bf3714612..cc43023a783a46a6eb52c06c30018f31f2a0a3bb 100644 (file)
--- a/src/detect-http-uri.c
+++ b/src/detect-http-uri.c
@@ -210,7 +210,7 @@ static void DetectHttpUriSetupCallback(const DetectEngineCtx *de_ctx,
  */
 static int DetectHttpUriSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_http_uri_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http_uri_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0)
         return -1;
@@ -305,7 +305,7 @@ static void DetectHttpRawUriSetupCallback(const DetectEngineCtx *de_ctx,
  */
 static int DetectHttpRawUriSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_http_raw_uri_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http_raw_uri_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0)
         return -1;

diff --git a/src/detect-http2.c b/src/detect-http2.c
index 83b9aeb8641c5f57042350aff142a2b06e3a9c73..69e79dfc9379bf7d0b508a0dd0e070ff6c24dd05 100644 (file)
--- a/src/detect-http2.c
+++ b/src/detect-http2.c
@@ -658,7 +658,7 @@ void DetectHTTP2settingsFree(DetectEngineCtx *de_ctx, void *ptr)
 
 static int DetectHTTP2headerNameSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_http2_header_name_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http2_header_name_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP2) != 0)
@@ -788,7 +788,7 @@ static uint8_t DetectEngineInspectHttp2HeaderName(DetectEngineCtx *de_ctx,
 
 static int DetectHTTP2headerSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_http2_header_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_http2_header_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_HTTP2) != 0)

diff --git a/src/detect-icmpv4hdr.c b/src/detect-icmpv4hdr.c
index 42a6b492227837a07f760bc6526ad0de402a685c..b0c6f54b75c4b90503be700bd04e6f65e6a97a2e 100644 (file)
--- a/src/detect-icmpv4hdr.c
+++ b/src/detect-icmpv4hdr.c
@@ -84,7 +84,7 @@ static int DetectIcmpv4HdrSetup(DetectEngineCtx *de_ctx, Signature *s, const cha
     s->proto.flags |= DETECT_PROTO_IPV4;
     s->flags |= SIG_FLAG_REQUIRE_PACKET;
 
-    if (DetectBufferSetActiveList(s, g_icmpv4hdr_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_icmpv4hdr_buffer_id) < 0)
         return -1;
 
     return 0;

diff --git a/src/detect-icmpv6hdr.c b/src/detect-icmpv6hdr.c
index 7de83dc5f1994ed3f8350022c9a3f323e8b4a23e..0d990e110866ba23fd880608e563c567f19dcc49 100644 (file)
--- a/src/detect-icmpv6hdr.c
+++ b/src/detect-icmpv6hdr.c
@@ -91,7 +91,7 @@ static int DetectICMPv6hdrSetup (DetectEngineCtx *de_ctx, Signature *s, const ch
 
     s->flags |= SIG_FLAG_REQUIRE_PACKET;
 
-    if (DetectBufferSetActiveList(s, g_icmpv6hdr_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_icmpv6hdr_buffer_id) < 0)
         return -1;
 
     return 0;

diff --git a/src/detect-ike-key-exchange-payload.c b/src/detect-ike-key-exchange-payload.c
index 4db49f715629ed6af3862dda7876be808ed586b0..813e5bf080cd75b579f1993946d699b93492c8a3 100644 (file)
--- a/src/detect-ike-key-exchange-payload.c
+++ b/src/detect-ike-key-exchange-payload.c
@@ -59,7 +59,7 @@ static int g_buffer_key_exchange_id = 0;
 
 static int DetectKeyExchangeSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_key_exchange_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_key_exchange_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_IKE) < 0)

diff --git a/src/detect-ike-nonce-payload.c b/src/detect-ike-nonce-payload.c
index 307ce23f43b056f87a66e78223d12b927d7f9806..a6b73cdf8487211d21488f486475f826906dcbf6 100644 (file)
--- a/src/detect-ike-nonce-payload.c
+++ b/src/detect-ike-nonce-payload.c
@@ -59,7 +59,7 @@ static int g_buffer_nonce_id = 0;
 
 static int DetectNonceSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_nonce_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_nonce_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_IKE) < 0)

diff --git a/src/detect-ike-spi.c b/src/detect-ike-spi.c
index d181dadb0a5417d869e32849b0e63a2a318325b1..5514d0202cb5b0ac7f10300ba56f19c7c689a9e6 100644 (file)
--- a/src/detect-ike-spi.c
+++ b/src/detect-ike-spi.c
@@ -65,7 +65,7 @@ static int g_buffer_responder_id = 0;
 
 static int DetectSpiInitiatorSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_initiator_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_initiator_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_IKE) < 0)
@@ -76,7 +76,7 @@ static int DetectSpiInitiatorSetup(DetectEngineCtx *de_ctx, Signature *s, const
 
 static int DetectSpiResponderSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_responder_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_responder_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_IKE) < 0)

diff --git a/src/detect-ike-vendor.c b/src/detect-ike-vendor.c
index 4dcc9c71b8bdef17d92b02f70c0cf32b488dbe62..edefc438224acaf468dd7afe7fe1e12f6f7d861b 100644 (file)
--- a/src/detect-ike-vendor.c
+++ b/src/detect-ike-vendor.c
@@ -204,7 +204,7 @@ void DetectIkeVendorRegister(void)
 
 static int DetectIkeVendorSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_ike_vendor_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_ike_vendor_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_IKE) < 0)
         return -1;

diff --git a/src/detect-ipv4hdr.c b/src/detect-ipv4hdr.c
index e39dddea05687158f57b01b00612d5aa71db6666..76334410e33f8e7c3710ad9f909bcb01abbe969d 100644 (file)
--- a/src/detect-ipv4hdr.c
+++ b/src/detect-ipv4hdr.c
@@ -87,7 +87,7 @@ static int DetectIpv4hdrSetup (DetectEngineCtx *de_ctx, Signature *s, const char
 
     s->flags |= SIG_FLAG_REQUIRE_PACKET;
 
-    if (DetectBufferSetActiveList(s, g_ipv4hdr_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_ipv4hdr_buffer_id) < 0)
         return -1;
 
     return 0;

diff --git a/src/detect-ipv6hdr.c b/src/detect-ipv6hdr.c
index e7221a9f9ea24b8f307b8aa6c29731de767c0fb5..eacff043a9f1c19f8eaca36b8d11832dee780396 100644 (file)
--- a/src/detect-ipv6hdr.c
+++ b/src/detect-ipv6hdr.c
@@ -87,7 +87,7 @@ static int DetectIpv6hdrSetup (DetectEngineCtx *de_ctx, Signature *s, const char
 
     s->flags |= SIG_FLAG_REQUIRE_PACKET;
 
-    if (DetectBufferSetActiveList(s, g_ipv6hdr_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_ipv6hdr_buffer_id) < 0)
         return -1;
 
     return 0;

diff --git a/src/detect-krb5-cname.c b/src/detect-krb5-cname.c
index 6054ccc5c68c72a2e203809844290fd65b87b8cb..257f3ed07124ffc0f4d7da3d3531907a09b064ac 100644 (file)
--- a/src/detect-krb5-cname.c
+++ b/src/detect-krb5-cname.c
@@ -46,7 +46,7 @@ struct Krb5PrincipalNameDataArgs {
 
 static int DetectKrb5CNameSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_krb5_cname_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_krb5_cname_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_KRB5) != 0)

diff --git a/src/detect-krb5-sname.c b/src/detect-krb5-sname.c
index eb281af2a2230ee459f34a5a55ac4d8ad7f1e50f..79c08f38a9967c725acddcf1ab451800f00d8c3d 100644 (file)
--- a/src/detect-krb5-sname.c
+++ b/src/detect-krb5-sname.c
@@ -46,7 +46,7 @@ struct Krb5PrincipalNameDataArgs {
 
 static int DetectKrb5SNameSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_krb5_sname_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_krb5_sname_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_KRB5) != 0)

diff --git a/src/detect-mqtt-connect-clientid.c b/src/detect-mqtt-connect-clientid.c
index 421b486d1e875cc88e190cd7e4f38d3a18d38350..1acebf9943bc8867b4aa29c6af9173e9317b8046 100644 (file)
--- a/src/detect-mqtt-connect-clientid.c
+++ b/src/detect-mqtt-connect-clientid.c
@@ -39,7 +39,7 @@ static int g_buffer_id = 0;
 
 static int DetectMQTTConnectClientIDSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_MQTT) < 0)

diff --git a/src/detect-mqtt-connect-password.c b/src/detect-mqtt-connect-password.c
index 9c964418cd456b4f88a0c344c59777ec1d4d17c9..c08390748fe0cf8f60b23c7edb1d2af5667d5a31 100644 (file)
--- a/src/detect-mqtt-connect-password.c
+++ b/src/detect-mqtt-connect-password.c
@@ -39,7 +39,7 @@ static int g_buffer_id = 0;
 
 static int DetectMQTTConnectPasswordSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_MQTT) < 0)

diff --git a/src/detect-mqtt-connect-username.c b/src/detect-mqtt-connect-username.c
index a4f5a723d56d62ce48e92aca1e2324b8fc92b46d..dbc772d22058839d2a1e6d80e6c397fe4827e296 100644 (file)
--- a/src/detect-mqtt-connect-username.c
+++ b/src/detect-mqtt-connect-username.c
@@ -39,7 +39,7 @@ static int g_buffer_id = 0;
 
 static int DetectMQTTConnectUsernameSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_MQTT) < 0)

diff --git a/src/detect-mqtt-connect-willmessage.c b/src/detect-mqtt-connect-willmessage.c
index 4fdcab6250b35cc05471ec553e60cb7dc705ac61..48d851d3209edc789879608be7c4b750320037da 100644 (file)
--- a/src/detect-mqtt-connect-willmessage.c
+++ b/src/detect-mqtt-connect-willmessage.c
@@ -39,7 +39,7 @@ static int g_buffer_id = 0;
 
 static int DetectMQTTConnectWillMessageSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_MQTT) < 0)

diff --git a/src/detect-mqtt-connect-willtopic.c b/src/detect-mqtt-connect-willtopic.c
index 2794a7d48c7f56189f3e048492585976b15dcb83..da3d2640dd9648a018bfb57a9fc35124d8938b2b 100644 (file)
--- a/src/detect-mqtt-connect-willtopic.c
+++ b/src/detect-mqtt-connect-willtopic.c
@@ -39,7 +39,7 @@ static int g_buffer_id = 0;
 
 static int DetectMQTTConnectWillTopicSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_MQTT) < 0)

diff --git a/src/detect-mqtt-publish-message.c b/src/detect-mqtt-publish-message.c
index 32671bc32c22dcc7d6ee9c15a9359a423d3f0733..32f3bd6460adc0bbb8dbd062b6468fd029461b31 100644 (file)
--- a/src/detect-mqtt-publish-message.c
+++ b/src/detect-mqtt-publish-message.c
@@ -39,7 +39,7 @@ static int g_buffer_id = 0;
 
 static int DetectMQTTPublishMessageSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_MQTT) < 0)

diff --git a/src/detect-mqtt-publish-topic.c b/src/detect-mqtt-publish-topic.c
index 3a33acf732c3ec5dc614de0359d1c609053cc256..c03a47b5eda7be7f52e106d04a183563bc6437db 100644 (file)
--- a/src/detect-mqtt-publish-topic.c
+++ b/src/detect-mqtt-publish-topic.c
@@ -39,7 +39,7 @@ static int g_buffer_id = 0;
 
 static int DetectMQTTPublishTopicSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_MQTT) < 0)

diff --git a/src/detect-mqtt-subscribe-topic.c b/src/detect-mqtt-subscribe-topic.c
index 34b813023fdba214b45889aac68e9a823061e71c..24c601c6e2afc949a54c68077346a8461a33eeb8 100644 (file)
--- a/src/detect-mqtt-subscribe-topic.c
+++ b/src/detect-mqtt-subscribe-topic.c
@@ -239,7 +239,7 @@ void DetectMQTTSubscribeTopicRegister (void)
 
 static int DetectMQTTSubscribeTopicSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_mqtt_subscribe_topic_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_mqtt_subscribe_topic_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_MQTT) < 0)
         return -1;

diff --git a/src/detect-mqtt-unsubscribe-topic.c b/src/detect-mqtt-unsubscribe-topic.c
index b6b113942f354730901c2410faa1c5f4caf382c6..d349971bee024e8a9d9d80250fce07db47367656 100644 (file)
--- a/src/detect-mqtt-unsubscribe-topic.c
+++ b/src/detect-mqtt-unsubscribe-topic.c
@@ -239,7 +239,7 @@ void DetectMQTTUnsubscribeTopicRegister (void)
 
 static int DetectMQTTUnsubscribeTopicSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_mqtt_unsubscribe_topic_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_mqtt_unsubscribe_topic_buffer_id) < 0)
         return -1;
     if (DetectSignatureSetAppProto(s, ALPROTO_MQTT) < 0)
         return -1;

diff --git a/src/detect-quic-cyu-hash.c b/src/detect-quic-cyu-hash.c
index 193f2fc3957221d7b48b2193b6c2c8ca54490136..c79f3ab2cb632ad643c93f91a615b29e611a9fd5 100644 (file)
--- a/src/detect-quic-cyu-hash.c
+++ b/src/detect-quic-cyu-hash.c
@@ -51,7 +51,7 @@ struct QuicHashGetDataArgs {
 
 static int DetectQuicCyuHashSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_QUIC) < 0)

diff --git a/src/detect-quic-cyu-string.c b/src/detect-quic-cyu-string.c
index 9e4f65887ba98b3f48ee18c0202ad70a5267ff92..d1ec757b21c9be9f7226c501c189d05e771b49f8 100644 (file)
--- a/src/detect-quic-cyu-string.c
+++ b/src/detect-quic-cyu-string.c
@@ -49,7 +49,7 @@ struct QuicStringGetDataArgs {
 
 static int DetectQuicCyuStringSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_QUIC) < 0)

diff --git a/src/detect-quic-sni.c b/src/detect-quic-sni.c
index 439f6b1fb69bd7be867152c1a8a29c8f9811caa9..722f50d04697995c1dd09eced899420cb0a3f039 100644 (file)
--- a/src/detect-quic-sni.c
+++ b/src/detect-quic-sni.c
@@ -102,7 +102,7 @@ void DetectQuicSniRegister(void)
  */
 static int DetectQuicSniSetup(DetectEngineCtx *de_ctx, Signature *s, const char *rawstr)
 {
-    if (DetectBufferSetActiveList(s, quic_sni_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, quic_sni_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_QUIC) < 0)

diff --git a/src/detect-quic-ua.c b/src/detect-quic-ua.c
index b90f4fc5e57541450049a2144781de9c892626b6..c491d05b06a2404daedfad20294dbfbbd6dba271 100644 (file)
--- a/src/detect-quic-ua.c
+++ b/src/detect-quic-ua.c
@@ -102,7 +102,7 @@ void DetectQuicUaRegister(void)
  */
 static int DetectQuicUaSetup(DetectEngineCtx *de_ctx, Signature *s, const char *rawstr)
 {
-    if (DetectBufferSetActiveList(s, quic_ua_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, quic_ua_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_QUIC) < 0)

diff --git a/src/detect-quic-version.c b/src/detect-quic-version.c
index d97f62ac1e9573290408916e3306dd84c977b900..fcd99545aad5db26644af11fc8dc94b9c622ffb6 100644 (file)
--- a/src/detect-quic-version.c
+++ b/src/detect-quic-version.c
@@ -106,7 +106,7 @@ void DetectQuicVersionRegister(void)
  */
 static int DetectQuicVersionSetup(DetectEngineCtx *de_ctx, Signature *s, const char *rawstr)
 {
-    if (DetectBufferSetActiveList(s, quic_version_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, quic_version_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_QUIC) < 0)

diff --git a/src/detect-rfb-name.c b/src/detect-rfb-name.c
index 464c4143fea9b0071a94781b9d66948a61b7c028..5e8251d51a5ac8f28a30fcd53f99e45426888fcb 100644 (file)
--- a/src/detect-rfb-name.c
+++ b/src/detect-rfb-name.c
@@ -58,7 +58,7 @@ static int g_buffer_id = 0;
 
 static int DetectRfbNameSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_RFB) < 0)

diff --git a/src/detect-sip-method.c b/src/detect-sip-method.c
index 98bd2cd5a4c748b96a8c7c2edfff59b88cac1e5b..bb2933e47956851614e96053b07ad69fafb0246d 100644 (file)
--- a/src/detect-sip-method.c
+++ b/src/detect-sip-method.c
@@ -61,7 +61,7 @@ static int g_buffer_id = 0;
 
 static int DetectSipMethodSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SIP) < 0)

diff --git a/src/detect-sip-protocol.c b/src/detect-sip-protocol.c
index f463346de4bb231d490f0f42f5a629d9e6cadb34..41fdcac538b3aad294fbbe45b7374637d1354842 100644 (file)
--- a/src/detect-sip-protocol.c
+++ b/src/detect-sip-protocol.c
@@ -62,7 +62,7 @@ static int g_buffer_id = 0;
 
 static int DetectSipProtocolSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SIP) < 0)

diff --git a/src/detect-sip-request-line.c b/src/detect-sip-request-line.c
index ee51737c4fa8b1cf9c6f1504abc69604a08ecfd3..9d9f4c9c5fe58d1cdb60c35bedd77eea61c3ba3c 100644 (file)
--- a/src/detect-sip-request-line.c
+++ b/src/detect-sip-request-line.c
@@ -61,7 +61,7 @@ static int g_buffer_id = 0;
 
 static int DetectSipRequestLineSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SIP) < 0)

diff --git a/src/detect-sip-response-line.c b/src/detect-sip-response-line.c
index 349dd7953863bea8a42fef1423e53538007eca6e..99061f951d5a1001be73df22746bb47206518f4f 100644 (file)
--- a/src/detect-sip-response-line.c
+++ b/src/detect-sip-response-line.c
@@ -61,7 +61,7 @@ static int g_buffer_id = 0;
 
 static int DetectSipResponseLineSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SIP) < 0)

diff --git a/src/detect-sip-stat-code.c b/src/detect-sip-stat-code.c
index 657582748bc9aca41bffe40912f361a7b22e3e29..9b663c971e8e2e8c5260891a4386102563409fb2 100644 (file)
--- a/src/detect-sip-stat-code.c
+++ b/src/detect-sip-stat-code.c
@@ -62,7 +62,7 @@ static int g_buffer_id = 0;
 
 static int DetectSipStatCodeSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SIP) < 0)

diff --git a/src/detect-sip-stat-msg.c b/src/detect-sip-stat-msg.c
index ff0e6885283964a5d22dc7da94600f70c54a3d35..a9b9247a5d70280aaccc111e9bff5f12e8358a00 100644 (file)
--- a/src/detect-sip-stat-msg.c
+++ b/src/detect-sip-stat-msg.c
@@ -62,7 +62,7 @@ static int g_buffer_id = 0;
 
 static int DetectSipStatMsgSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SIP) < 0)

diff --git a/src/detect-sip-uri.c b/src/detect-sip-uri.c
index a2de8294c1844d7bc089993711dc07c7f29c8955..1a000fdb543aecd6d99fc821c77ca2e77a08b089 100644 (file)
--- a/src/detect-sip-uri.c
+++ b/src/detect-sip-uri.c
@@ -74,7 +74,7 @@ static void DetectSipUriSetupCallback(const DetectEngineCtx *de_ctx,
 
 static int DetectSipUriSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SIP) < 0)

diff --git a/src/detect-smb-ntlmssp.c b/src/detect-smb-ntlmssp.c
index c301b0299a4049b86759794ca5f15ec199a108cd..a88b89c6f473f4bacc63b823e8c6f2a8ea07317c 100644 (file)
--- a/src/detect-smb-ntlmssp.c
+++ b/src/detect-smb-ntlmssp.c
@@ -45,7 +45,7 @@ static int g_smb_nltmssp_user_buffer_id = 0;
 
 static int DetectSmbNtlmsspUserSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_smb_nltmssp_user_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_smb_nltmssp_user_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SMB) < 0)
@@ -102,7 +102,7 @@ static int g_smb_nltmssp_domain_buffer_id = 0;
 
 static int DetectSmbNtlmsspDomainSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_smb_nltmssp_domain_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_smb_nltmssp_domain_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SMB) < 0)

diff --git a/src/detect-smb-share.c b/src/detect-smb-share.c
index c54ffa3779cc04ea45667527be91cf9ebe99b0af..8d4d145fad8cc9f3729ce8b863d83f59f7c89b42 100644 (file)
--- a/src/detect-smb-share.c
+++ b/src/detect-smb-share.c
@@ -45,7 +45,7 @@ static int g_smb_named_pipe_buffer_id = 0;
 
 static int DetectSmbNamedPipeSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_smb_named_pipe_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_smb_named_pipe_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SMB) < 0)
@@ -108,7 +108,7 @@ static int g_smb_share_buffer_id = 0;
 
 static int DetectSmbShareSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_smb_share_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_smb_share_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SMB) < 0)

diff --git a/src/detect-snmp-community.c b/src/detect-snmp-community.c
index f1882c269e38cd9fcac159de4f16ccf318b0bf3c..93e7d21671ab449b7b5d2ac069b888fb2311e62a 100644 (file)
--- a/src/detect-snmp-community.c
+++ b/src/detect-snmp-community.c
@@ -81,7 +81,7 @@ void DetectSNMPCommunityRegister(void)
 static int DetectSNMPCommunitySetup(DetectEngineCtx *de_ctx, Signature *s,
     const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_snmp_rust_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_snmp_rust_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SNMP) != 0)

diff --git a/src/detect-snmp-usm.c b/src/detect-snmp-usm.c
index a6c7403eb435cca68063fbc6f0f6e39d81726be3..2e03fca16b94a4252e37670fa678fcca816128da 100644 (file)
--- a/src/detect-snmp-usm.c
+++ b/src/detect-snmp-usm.c
@@ -27,7 +27,7 @@ static int g_buffer_id = 0;
 
 static int DetectSNMPUsmSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SNMP) != 0)

diff --git a/src/detect-ssh-hassh-server-string.c b/src/detect-ssh-hassh-server-string.c
index 0afe683ba49cd083a6893792c8beee84f8771893..27b0e0cb75956ba2ee8bc6736b6056db025b1f6b 100644 (file)
--- a/src/detect-ssh-hassh-server-string.c
+++ b/src/detect-ssh-hassh-server-string.c
@@ -96,7 +96,7 @@ static InspectionBuffer *GetSshData(DetectEngineThreadCtx *det_ctx,
  */
 static int DetectSshHasshServerStringSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_ssh_hassh_server_string_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_ssh_hassh_server_string_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SSH) < 0)

diff --git a/src/detect-ssh-hassh-server.c b/src/detect-ssh-hassh-server.c
index 30ed206b508bfa003b6f8262e71a4de3fe80f43c..4f04287428336147a0c33254dabac41e3fed5288 100644 (file)
--- a/src/detect-ssh-hassh-server.c
+++ b/src/detect-ssh-hassh-server.c
@@ -97,7 +97,7 @@ static InspectionBuffer *GetSshData(DetectEngineThreadCtx *det_ctx,
  */
 static int DetectSshHasshServerSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_ssh_hassh_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_ssh_hassh_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SSH) < 0)

diff --git a/src/detect-ssh-hassh-string.c b/src/detect-ssh-hassh-string.c
index 64cf45182b7eea1dc7fe5e272308bfed1cb4bf6b..e639e64b134ff301be53a676577e5ab4c4c07545 100644 (file)
--- a/src/detect-ssh-hassh-string.c
+++ b/src/detect-ssh-hassh-string.c
@@ -96,7 +96,7 @@ static InspectionBuffer *GetSshData(DetectEngineThreadCtx *det_ctx,
  */
 static int DetectSshHasshStringSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_ssh_hassh_string_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_ssh_hassh_string_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SSH) < 0)

diff --git a/src/detect-ssh-hassh.c b/src/detect-ssh-hassh.c
index 5c87fe1904e1910068f4f97a14446509d41d7b0d..a2da4e2c3b43b8064eb9d591a988b79f1db889fe 100644 (file)
--- a/src/detect-ssh-hassh.c
+++ b/src/detect-ssh-hassh.c
@@ -97,7 +97,7 @@ static InspectionBuffer *GetSshData(DetectEngineThreadCtx *det_ctx,
  */
 static int DetectSshHasshSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_ssh_hassh_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_ssh_hassh_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SSH) < 0)

diff --git a/src/detect-ssh-proto.c b/src/detect-ssh-proto.c
index 4f4874a9161b4895e7b50062a6f32a1ecbdb6f7c..a979190de1a9361900f3c61c9dd662cead3e7ee5 100644 (file)
--- a/src/detect-ssh-proto.c
+++ b/src/detect-ssh-proto.c
@@ -83,7 +83,7 @@ static InspectionBuffer *GetSshData(DetectEngineThreadCtx *det_ctx,
 
 static int DetectSshProtocolSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SSH) < 0)

diff --git a/src/detect-ssh-software.c b/src/detect-ssh-software.c
index ac7b1973cedf3aa6d24546f8834c56df11d391a0..cd11c5c209049c18139edae8bd88a3be9afafcdb 100644 (file)
--- a/src/detect-ssh-software.c
+++ b/src/detect-ssh-software.c
@@ -83,7 +83,7 @@ static InspectionBuffer *GetSshData(DetectEngineThreadCtx *det_ctx,
 
 static int DetectSshSoftwareSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg)
 {
-    if (DetectBufferSetActiveList(s, g_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_SSH) < 0)

diff --git a/src/detect-tcphdr.c b/src/detect-tcphdr.c
index 4b6a65986d275101a3e94e759d3f2cb26a50eced..f054e35509709de1d36076edb29c4a7883b0550e 100644 (file)
--- a/src/detect-tcphdr.c
+++ b/src/detect-tcphdr.c
@@ -88,7 +88,7 @@ static int DetectTcphdrSetup (DetectEngineCtx *de_ctx, Signature *s, const char
 
     s->flags |= SIG_FLAG_REQUIRE_PACKET;
 
-    if (DetectBufferSetActiveList(s, g_tcphdr_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_tcphdr_buffer_id) < 0)
         return -1;
 
     return 0;

diff --git a/src/detect-tls-cert-fingerprint.c b/src/detect-tls-cert-fingerprint.c
index 83e802b065725445aeec2ed8c551cdb652f5c0bd..b459c440ce9e16fe4482d74eeb7e16654a0a7690 100644 (file)
--- a/src/detect-tls-cert-fingerprint.c
+++ b/src/detect-tls-cert-fingerprint.c
@@ -122,7 +122,7 @@ void DetectTlsFingerprintRegister(void)
 static int DetectTlsFingerprintSetup(DetectEngineCtx *de_ctx, Signature *s,
                                      const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_tls_cert_fingerprint_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_tls_cert_fingerprint_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_TLS) < 0)

diff --git a/src/detect-tls-cert-issuer.c b/src/detect-tls-cert-issuer.c
index 73044f7411da1341da704e751cde9b8b42445593..9146f8d0f40be2dd2d2edf5f6c19ebbbb2ab9be5 100644 (file)
--- a/src/detect-tls-cert-issuer.c
+++ b/src/detect-tls-cert-issuer.c
@@ -112,7 +112,7 @@ void DetectTlsIssuerRegister(void)
  */
 static int DetectTlsIssuerSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_tls_cert_issuer_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_tls_cert_issuer_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_TLS) < 0)

diff --git a/src/detect-tls-cert-serial.c b/src/detect-tls-cert-serial.c
index 51c61dbf0ef16ab759d77a8f2e24a8fa89e86de9..be03423d394490605a1cc79aac8b9b9ba10b05a7 100644 (file)
--- a/src/detect-tls-cert-serial.c
+++ b/src/detect-tls-cert-serial.c
@@ -121,7 +121,7 @@ void DetectTlsSerialRegister(void)
  */
 static int DetectTlsSerialSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_tls_cert_serial_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_tls_cert_serial_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_TLS) < 0)

diff --git a/src/detect-tls-cert-subject.c b/src/detect-tls-cert-subject.c
index ee6a13d345f4099fc5687f5ca6afdd58f857a957..282ecd10e139d316b16c741d87b55bd2ff84b355 100644 (file)
--- a/src/detect-tls-cert-subject.c
+++ b/src/detect-tls-cert-subject.c
@@ -110,7 +110,7 @@ void DetectTlsSubjectRegister(void)
  */
 static int DetectTlsSubjectSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_tls_cert_subject_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_tls_cert_subject_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_TLS) < 0)

diff --git a/src/detect-tls-certs.c b/src/detect-tls-certs.c
index 08bf6af2bdac1ad85ec4c4f23cb1b577828f9d7a..a5e7a11cea2b8c76715260131ba96ea9480aa51a 100644 (file)
--- a/src/detect-tls-certs.c
+++ b/src/detect-tls-certs.c
@@ -126,7 +126,7 @@ void DetectTlsCertsRegister(void)
 static int DetectTlsCertsSetup(DetectEngineCtx *de_ctx, Signature *s,
                                const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_tls_certs_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_tls_certs_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_TLS) < 0)

diff --git a/src/detect-tls-ja3-hash.c b/src/detect-tls-ja3-hash.c
index 8b9ce947fe7b479ae5d64ec0dce0d0ed8aae7ec3..8aa1f58f303a51310a424307405845becfe8e448 100644 (file)
--- a/src/detect-tls-ja3-hash.c
+++ b/src/detect-tls-ja3-hash.c
@@ -116,7 +116,7 @@ void DetectTlsJa3HashRegister(void)
  */
 static int DetectTlsJa3HashSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_tls_ja3_hash_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_tls_ja3_hash_buffer_id) < 0)
         return -1;
 
     if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_TLS && s->alproto != ALPROTO_QUIC) {

diff --git a/src/detect-tls-ja3-string.c b/src/detect-tls-ja3-string.c
index 85df0706594d3978bfeb17f117d2bbd9c714679f..87a61bfd873879729b7547a2cf7bda60fa997965 100644 (file)
--- a/src/detect-tls-ja3-string.c
+++ b/src/detect-tls-ja3-string.c
@@ -105,7 +105,7 @@ void DetectTlsJa3StringRegister(void)
  */
 static int DetectTlsJa3StringSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_tls_ja3_str_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_tls_ja3_str_buffer_id) < 0)
         return -1;
 
     if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_TLS && s->alproto != ALPROTO_QUIC) {

diff --git a/src/detect-tls-ja3s-hash.c b/src/detect-tls-ja3s-hash.c
index 68be626aa1168881d25ad306debc2b333af17d03..93dc9e24abd8a55864d9c37fdce488eed5fadefa 100644 (file)
--- a/src/detect-tls-ja3s-hash.c
+++ b/src/detect-tls-ja3s-hash.c
@@ -114,7 +114,7 @@ void DetectTlsJa3SHashRegister(void)
  */
 static int DetectTlsJa3SHashSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_tls_ja3s_hash_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_tls_ja3s_hash_buffer_id) < 0)
         return -1;
 
     if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_TLS && s->alproto != ALPROTO_QUIC) {

diff --git a/src/detect-tls-ja3s-string.c b/src/detect-tls-ja3s-string.c
index db9ba3f1016120e7ed7613eac56173e266df5bef..0f7f7d61d0677bf7c608e069deb5f3ecc65a329d 100644 (file)
--- a/src/detect-tls-ja3s-string.c
+++ b/src/detect-tls-ja3s-string.c
@@ -105,7 +105,7 @@ void DetectTlsJa3SStringRegister(void)
  */
 static int DetectTlsJa3SStringSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_tls_ja3s_str_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_tls_ja3s_str_buffer_id) < 0)
         return -1;
 
     if (s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_TLS && s->alproto != ALPROTO_QUIC) {

diff --git a/src/detect-tls-random.c b/src/detect-tls-random.c
index 40be3fe8716e052144437969ad2db9ccb076573e..fc4369ab1861d0115332c0536d9759b8769052d4 100644 (file)
--- a/src/detect-tls-random.c
+++ b/src/detect-tls-random.c
@@ -150,7 +150,7 @@ void DetectTlsRandomRegister(void)
  */
 static int DetectTlsRandomTimeSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_tls_random_time_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_tls_random_time_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_TLS) < 0)
@@ -171,7 +171,7 @@ static int DetectTlsRandomTimeSetup(DetectEngineCtx *de_ctx, Signature *s, const
  */
 static int DetectTlsRandomBytesSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_tls_random_bytes_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_tls_random_bytes_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_TLS) < 0)
@@ -192,7 +192,7 @@ static int DetectTlsRandomBytesSetup(DetectEngineCtx *de_ctx, Signature *s, cons
  */
 static int DetectTlsRandomSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_tls_random_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_tls_random_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_TLS) < 0)

diff --git a/src/detect-tls-sni.c b/src/detect-tls-sni.c
index eb3f385c56513610c0c2186f83af23265ac666d0..69b066e8e979faaae90aa34a6b5fb95137826841 100644 (file)
--- a/src/detect-tls-sni.c
+++ b/src/detect-tls-sni.c
@@ -98,7 +98,7 @@ void DetectTlsSniRegister(void)
  */
 static int DetectTlsSniSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
-    if (DetectBufferSetActiveList(s, g_tls_sni_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_tls_sni_buffer_id) < 0)
         return -1;
 
     if (DetectSignatureSetAppProto(s, ALPROTO_TLS) < 0)

diff --git a/src/detect-udphdr.c b/src/detect-udphdr.c
index 6c58a8883c59b55efb180dd2c594c56969e82a97..8aa645b92641a3aaceeb7fa48ffa37c8ff53b387 100644 (file)
--- a/src/detect-udphdr.c
+++ b/src/detect-udphdr.c
@@ -86,7 +86,7 @@ static int DetectUdphdrSetup (DetectEngineCtx *de_ctx, Signature *s, const char
 
     s->flags |= SIG_FLAG_REQUIRE_PACKET;
 
-    if (DetectBufferSetActiveList(s, g_udphdr_buffer_id) < 0)
+    if (DetectBufferSetActiveList(de_ctx, s, g_udphdr_buffer_id) < 0)
         return -1;
 
     return 0;