detect: pass de_ctx to DetectBufferSetActiveList

pull/8732/head
Victor Julien 2 years ago
parent f43b7191ae
commit 2c0e434bb8

@ -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;
}

@ -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);

@ -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;

@ -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);

@ -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);

@ -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;

@ -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) {

@ -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;

@ -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);

@ -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;

@ -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)

@ -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)

@ -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;

@ -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)

@ -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;

@ -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)

@ -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)

@ -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;

@ -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)

@ -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)

@ -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;

@ -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)

@ -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;

@ -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;

@ -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;

@ -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;

@ -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)

@ -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;

@ -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;

@ -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)

@ -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)

@ -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)

@ -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;

@ -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;

@ -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;

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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;

@ -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;

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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;

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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) {

@ -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) {

@ -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) {

@ -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) {

@ -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)

@ -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)

@ -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;

Loading…
Cancel
Save