From: Philippe Antoine Date: Tue, 22 Apr 2025 13:42:31 +0000 (+0200) Subject: rust: bindgen detect-engine-buffer.h X-Git-Tag: suricata-8.0.0-rc1~406 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dadf9012fcbd5888825a18653e954a61b886bed2;p=thirdparty%2Fsuricata.git rust: bindgen detect-engine-buffer.h Ticket: 7667 And prefix SCDetectBufferSetActiveList to be exported Allows less use of suricata crate in plugin as we get the functions prototypes from suricata_sys and they are more correct. --- diff --git a/examples/plugins/altemplate/src/detect.rs b/examples/plugins/altemplate/src/detect.rs index 4128505bdf..59b54742ab 100644 --- a/examples/plugins/altemplate/src/detect.rs +++ b/examples/plugins/altemplate/src/detect.rs @@ -24,21 +24,21 @@ use super::template::{TemplateTransaction, ALPROTO_TEMPLATE}; use std::os::raw::{c_int, c_void}; use suricata::cast_pointer; use suricata::detect::{ - helper_keyword_register_sticky_buffer, DetectBufferSetActiveList, - DetectHelperBufferMpmRegister, DetectHelperGetData, DetectSignatureSetAppProto, - SigTableElmtStickyBuffer, + helper_keyword_register_sticky_buffer, DetectHelperBufferMpmRegister, DetectHelperGetData, + DetectSignatureSetAppProto, SigTableElmtStickyBuffer, }; use suricata::direction::Direction; +use suricata_sys::sys::{DetectEngineCtx, SCDetectBufferSetActiveList, Signature}; static mut G_TEMPLATE_BUFFER_BUFFER_ID: c_int = 0; unsafe extern "C" fn template_buffer_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_TEMPLATE) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_TEMPLATE_BUFFER_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_TEMPLATE_BUFFER_BUFFER_ID) < 0 { return -1; } return 0; diff --git a/rust/src/applayertemplate/detect.rs b/rust/src/applayertemplate/detect.rs index 2dc936f7a3..93d1f3da9f 100644 --- a/rust/src/applayertemplate/detect.rs +++ b/rust/src/applayertemplate/detect.rs @@ -20,22 +20,22 @@ use super::template::{TemplateTransaction, ALPROTO_TEMPLATE}; use crate::conf::conf_get_node; /* TEMPLATE_END_REMOVE */ use crate::detect::{ - helper_keyword_register_sticky_buffer, DetectBufferSetActiveList, - DetectHelperBufferMpmRegister, DetectHelperGetData, DetectSignatureSetAppProto, - SigTableElmtStickyBuffer, + helper_keyword_register_sticky_buffer, DetectHelperBufferMpmRegister, DetectHelperGetData, + DetectSignatureSetAppProto, SigTableElmtStickyBuffer, }; use crate::direction::Direction; use std::os::raw::{c_int, c_void}; +use suricata_sys::sys::{DetectEngineCtx, SCDetectBufferSetActiveList, Signature}; static mut G_TEMPLATE_BUFFER_BUFFER_ID: c_int = 0; unsafe extern "C" fn template_buffer_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_TEMPLATE) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_TEMPLATE_BUFFER_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_TEMPLATE_BUFFER_BUFFER_ID) < 0 { return -1; } return 0; diff --git a/rust/src/detect/mod.rs b/rust/src/detect/mod.rs index 6623f03cd5..ff94b08e48 100644 --- a/rust/src/detect/mod.rs +++ b/rust/src/detect/mod.rs @@ -39,7 +39,7 @@ use std::os::raw::{c_char, c_int, c_void}; use std::ffi::CString; use crate::core::DetectEngineThreadCtx; -use suricata_sys::sys::AppProto; +use suricata_sys::sys::{AppProto, DetectEngineCtx, Signature}; /// EnumString trait that will be implemented on enums that /// derive StringEnum. @@ -67,8 +67,8 @@ pub struct SigTableElmtStickyBuffer { pub url: String, /// function callback to parse and setup keyword in rule pub setup: unsafe extern "C" fn( - de: *mut c_void, - s: *mut c_void, + de: *mut DetectEngineCtx, + s: *mut Signature, raw: *const std::os::raw::c_char, ) -> c_int, } @@ -126,8 +126,8 @@ pub struct SCSigTableAppLiteElmt { pub flags: u16, /// function callback to parse and setup keyword in rule pub Setup: unsafe extern "C" fn( - de: *mut c_void, - s: *mut c_void, + de: *mut DetectEngineCtx, + s: *mut Signature, raw: *const std::os::raw::c_char, ) -> c_int, /// function callback to free structure allocated by setup if any @@ -153,7 +153,6 @@ pub const SIGMATCH_INFO_STICKY_BUFFER: u16 = 0x200; // BIT_U16(9) /// cbindgen:ignore extern "C" { pub fn DetectHelperKeywordSetCleanCString(id: c_int); - pub fn DetectBufferSetActiveList(de: *mut c_void, s: *mut c_void, bufid: c_int) -> c_int; pub fn DetectHelperGetData( de: *mut c_void, transforms: *const c_void, flow: *const c_void, flow_flags: u8, tx: *const c_void, list_id: c_int, @@ -176,9 +175,9 @@ extern "C" { pub fn DetectHelperBufferRegister( name: *const libc::c_char, alproto: AppProto, toclient: bool, toserver: bool, ) -> c_int; - pub fn DetectSignatureSetAppProto(s: *mut c_void, alproto: AppProto) -> c_int; + pub fn DetectSignatureSetAppProto(s: *mut Signature, alproto: AppProto) -> c_int; pub fn SigMatchAppendSMToList( - de: *mut c_void, s: *mut c_void, kwid: c_int, ctx: *const c_void, bufid: c_int, + de: *mut DetectEngineCtx, s: *mut Signature, kwid: c_int, ctx: *const c_void, bufid: c_int, ) -> *mut c_void; // in detect-engine-helper.h pub fn DetectHelperMultiBufferMpmRegister( diff --git a/rust/src/dhcp/detect.rs b/rust/src/dhcp/detect.rs index 563396f307..6ac302baf2 100644 --- a/rust/src/dhcp/detect.rs +++ b/rust/src/dhcp/detect.rs @@ -27,6 +27,7 @@ use crate::detect::{ DetectHelperBufferRegister, DetectHelperKeywordRegister, DetectSignatureSetAppProto, SCSigTableAppLiteElmt, SigMatchAppendSMToList, }; +use suricata_sys::sys::{DetectEngineCtx, Signature}; use std::os::raw::{c_int, c_void}; fn dhcp_tx_get_time(tx: &DHCPTransaction, code: u8) -> Option { @@ -48,7 +49,7 @@ static mut G_DHCP_RENEWAL_TIME_KW_ID: c_int = 0; static mut G_DHCP_RENEWAL_TIME_BUFFER_ID: c_int = 0; unsafe extern "C" fn dhcp_detect_leasetime_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_DHCP) != 0 { return -1; @@ -91,7 +92,7 @@ unsafe extern "C" fn dhcp_detect_time_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn dhcp_detect_rebindingtime_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_DHCP) != 0 { return -1; @@ -128,7 +129,7 @@ unsafe extern "C" fn dhcp_detect_rebindingtime_match( } unsafe extern "C" fn dhcp_detect_renewaltime_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_DHCP) != 0 { return -1; diff --git a/rust/src/dns/detect.rs b/rust/src/dns/detect.rs index b30bc496a8..2136bbdf58 100644 --- a/rust/src/dns/detect.rs +++ b/rust/src/dns/detect.rs @@ -22,7 +22,7 @@ use crate::detect::uint::{ SCDetectU8Parse, }; use crate::detect::{ - helper_keyword_register_sticky_buffer, DetectBufferSetActiveList, DetectHelperBufferRegister, + helper_keyword_register_sticky_buffer, DetectHelperBufferRegister, DetectHelperKeywordAliasRegister, DetectHelperKeywordRegister, DetectHelperMultiBufferProgressMpmRegister, DetectSignatureSetAppProto, SCSigTableAppLiteElmt, SigMatchAppendSMToList, SigTableElmtStickyBuffer, @@ -30,6 +30,7 @@ use crate::detect::{ use crate::direction::Direction; use std::ffi::CStr; use std::os::raw::{c_int, c_void}; +use suricata_sys::sys::{DetectEngineCtx, SCDetectBufferSetActiveList, Signature}; /// Perform the DNS opcode match. /// @@ -133,7 +134,7 @@ static mut G_DNS_RRTYPE_KW_ID: c_int = 0; static mut G_DNS_RRTYPE_BUFFER_ID: c_int = 0; unsafe extern "C" fn dns_opcode_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_DNS) != 0 { return -1; @@ -167,7 +168,7 @@ unsafe extern "C" fn dns_rcode_parse(ustr: *const std::os::raw::c_char) -> *mut } unsafe extern "C" fn dns_rcode_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_DNS) != 0 { return -1; @@ -203,7 +204,7 @@ unsafe extern "C" fn dns_rrtype_parse( } unsafe extern "C" fn dns_rrtype_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_DNS) != 0 { return -1; @@ -226,12 +227,12 @@ unsafe extern "C" fn dns_rrtype_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn dns_detect_answer_name_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_DNS) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_DNS_ANSWER_NAME_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_DNS_ANSWER_NAME_BUFFER_ID) < 0 { return -1; } return 0; @@ -264,12 +265,12 @@ unsafe extern "C" fn dns_tx_get_answer_name( } unsafe extern "C" fn dns_detect_query_name_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_DNS) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_DNS_QUERY_NAME_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_DNS_QUERY_NAME_BUFFER_ID) < 0 { return -1; } return 0; @@ -309,12 +310,12 @@ unsafe extern "C" fn dns_tx_get_query( } unsafe extern "C" fn dns_detect_query_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_DNS) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_DNS_QUERY_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_DNS_QUERY_BUFFER_ID) < 0 { return -1; } return 0; diff --git a/rust/src/enip/detect.rs b/rust/src/enip/detect.rs index a5db3cdb03..4ed80d4409 100644 --- a/rust/src/enip/detect.rs +++ b/rust/src/enip/detect.rs @@ -35,11 +35,12 @@ use crate::detect::uint::{ SCDetectU8Match, SCDetectU8Parse, }; use crate::detect::{ - helper_keyword_register_sticky_buffer, DetectBufferSetActiveList, - DetectHelperBufferMpmRegister, DetectHelperBufferRegister, DetectHelperGetData, - DetectHelperKeywordRegister, DetectSignatureSetAppProto, SCSigTableAppLiteElmt, - SigMatchAppendSMToList, SigTableElmtStickyBuffer, + helper_keyword_register_sticky_buffer, DetectHelperBufferMpmRegister, + DetectHelperBufferRegister, DetectHelperGetData, DetectHelperKeywordRegister, + DetectSignatureSetAppProto, SCSigTableAppLiteElmt, SigMatchAppendSMToList, + SigTableElmtStickyBuffer, }; +use suricata_sys::sys::{DetectEngineCtx, SCDetectBufferSetActiveList, Signature}; use crate::direction::Direction; @@ -448,7 +449,7 @@ unsafe fn parse_cip_service(raw: *const std::os::raw::c_char) -> *mut c_void { } unsafe extern "C" fn cipservice_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -486,7 +487,7 @@ unsafe extern "C" fn cipservice_match( } unsafe extern "C" fn capabilities_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -542,7 +543,7 @@ unsafe extern "C" fn capabilities_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn cip_attribute_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -582,7 +583,7 @@ unsafe extern "C" fn cip_attribute_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn cip_class_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -622,7 +623,7 @@ unsafe extern "C" fn cip_class_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn vendor_id_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -678,7 +679,7 @@ unsafe extern "C" fn vendor_id_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn status_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -713,7 +714,7 @@ unsafe extern "C" fn status_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn state_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -761,7 +762,7 @@ unsafe extern "C" fn state_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn serial_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -809,7 +810,7 @@ unsafe extern "C" fn serial_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn revision_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -859,7 +860,7 @@ unsafe extern "C" fn revision_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn protocol_version_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -902,7 +903,7 @@ unsafe extern "C" fn protocol_version_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn product_code_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -958,7 +959,7 @@ unsafe extern "C" fn product_code_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn identity_status_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -1014,7 +1015,7 @@ unsafe extern "C" fn identity_status_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn device_type_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -1070,7 +1071,7 @@ unsafe extern "C" fn device_type_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn command_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -1118,7 +1119,7 @@ unsafe extern "C" fn command_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn cip_status_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -1158,7 +1159,7 @@ unsafe extern "C" fn cip_status_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn cip_instance_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -1198,7 +1199,7 @@ unsafe extern "C" fn cip_instance_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn cip_extendedstatus_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; @@ -1238,12 +1239,12 @@ unsafe extern "C" fn cip_extendedstatus_free(_de: *mut c_void, ctx: *mut c_void) } pub unsafe extern "C" fn product_name_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_ENIP_PRODUCT_NAME_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_ENIP_PRODUCT_NAME_BUFFER_ID) < 0 { return -1; } return 0; @@ -1285,12 +1286,12 @@ unsafe extern "C" fn product_name_get_data( } pub unsafe extern "C" fn service_name_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_ENIP_SERVICE_NAME_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_ENIP_SERVICE_NAME_BUFFER_ID) < 0 { return -1; } return 0; diff --git a/rust/src/ldap/detect.rs b/rust/src/ldap/detect.rs index 9ac843893f..a8c0dfe6c3 100644 --- a/rust/src/ldap/detect.rs +++ b/rust/src/ldap/detect.rs @@ -22,12 +22,13 @@ use crate::detect::uint::{ SCDetectU8Free, }; use crate::detect::{ - helper_keyword_register_sticky_buffer, DetectBufferSetActiveList, - DetectHelperBufferMpmRegister, DetectHelperBufferRegister, DetectHelperGetData, - DetectHelperKeywordRegister, DetectHelperMultiBufferMpmRegister, DetectSignatureSetAppProto, - SCSigTableAppLiteElmt, SigMatchAppendSMToList, SigTableElmtStickyBuffer, + helper_keyword_register_sticky_buffer, DetectHelperBufferMpmRegister, + DetectHelperBufferRegister, DetectHelperGetData, DetectHelperKeywordRegister, + DetectHelperMultiBufferMpmRegister, DetectSignatureSetAppProto, SCSigTableAppLiteElmt, + SigMatchAppendSMToList, SigTableElmtStickyBuffer, }; use crate::ldap::types::{LdapMessage, LdapResultCode, ProtocolOp, ProtocolOpCode}; +use suricata_sys::sys::{DetectEngineCtx, SCDetectBufferSetActiveList, Signature}; use std::collections::VecDeque; use std::ffi::CStr; @@ -88,7 +89,7 @@ unsafe extern "C" fn ldap_parse_protocol_req_op( } unsafe extern "C" fn ldap_detect_request_operation_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_LDAP) != 0 { return -1; @@ -173,7 +174,7 @@ unsafe extern "C" fn ldap_parse_protocol_resp_op( } unsafe extern "C" fn ldap_detect_responses_operation_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_LDAP) != 0 { return -1; @@ -263,7 +264,7 @@ unsafe extern "C" fn ldap_detect_responses_free(_de: *mut c_void, ctx: *mut c_vo } unsafe extern "C" fn ldap_detect_responses_count_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_LDAP) != 0 { return -1; @@ -304,12 +305,12 @@ unsafe extern "C" fn ldap_detect_responses_count_free(_de: *mut c_void, ctx: *mu } unsafe extern "C" fn ldap_detect_request_dn_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_LDAP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_LDAP_REQUEST_DN_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_LDAP_REQUEST_DN_BUFFER_ID) < 0 { return -1; } return 0; @@ -357,12 +358,12 @@ unsafe extern "C" fn ldap_tx_get_request_dn( } unsafe extern "C" fn ldap_detect_responses_dn_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_LDAP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_LDAP_RESPONSES_DN_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_LDAP_RESPONSES_DN_BUFFER_ID) < 0 { return -1; } return 0; @@ -428,7 +429,7 @@ unsafe extern "C" fn ldap_parse_responses_result_code( } unsafe extern "C" fn ldap_detect_responses_result_code_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_LDAP) != 0 { return -1; @@ -489,12 +490,12 @@ unsafe extern "C" fn ldap_detect_responses_result_code_free(_de: *mut c_void, ct } unsafe extern "C" fn ldap_detect_responses_msg_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_LDAP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_LDAP_RESPONSES_MSG_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_LDAP_RESPONSES_MSG_BUFFER_ID) < 0 { return -1; } return 0; @@ -534,12 +535,12 @@ unsafe extern "C" fn ldap_tx_get_responses_msg( } unsafe extern "C" fn ldap_detect_request_attibute_type_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_LDAP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_LDAP_REQUEST_ATTRIBUTE_TYPE_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_LDAP_REQUEST_ATTRIBUTE_TYPE_BUFFER_ID) < 0 { return -1; } return 0; @@ -593,12 +594,12 @@ unsafe extern "C" fn ldap_tx_get_req_attribute_type( } unsafe extern "C" fn ldap_detect_responses_attibute_type_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_LDAP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_LDAP_RESPONSES_ATTRIBUTE_TYPE_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_LDAP_RESPONSES_ATTRIBUTE_TYPE_BUFFER_ID) < 0 { return -1; } return 0; diff --git a/rust/src/mqtt/detect.rs b/rust/src/mqtt/detect.rs index 500300da75..0359fc51d5 100644 --- a/rust/src/mqtt/detect.rs +++ b/rust/src/mqtt/detect.rs @@ -23,11 +23,12 @@ use crate::detect::uint::{ SCDetectU8Free, SCDetectU8Parse, }; use crate::detect::{ - helper_keyword_register_sticky_buffer, DetectBufferSetActiveList, - DetectHelperBufferMpmRegister, DetectHelperBufferRegister, DetectHelperGetData, - DetectHelperKeywordRegister, DetectHelperMultiBufferMpmRegister, DetectSignatureSetAppProto, - SCSigTableAppLiteElmt, SigMatchAppendSMToList, SigTableElmtStickyBuffer, + helper_keyword_register_sticky_buffer, DetectHelperBufferMpmRegister, + DetectHelperBufferRegister, DetectHelperGetData, DetectHelperKeywordRegister, + DetectHelperMultiBufferMpmRegister, DetectSignatureSetAppProto, SCSigTableAppLiteElmt, + SigMatchAppendSMToList, SigTableElmtStickyBuffer, }; +use suricata_sys::sys::{DetectEngineCtx, SCDetectBufferSetActiveList, Signature}; use nom7::branch::alt; use nom7::bytes::complete::{is_a, tag}; @@ -328,12 +329,12 @@ unsafe extern "C" fn unsub_topic_get_data( } unsafe extern "C" fn unsub_topic_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_MQTT_UNSUB_TOPIC_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_MQTT_UNSUB_TOPIC_BUFFER_ID) < 0 { return -1; } @@ -369,12 +370,12 @@ unsafe extern "C" fn sub_topic_get_data( } unsafe extern "C" fn sub_topic_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_MQTT_SUB_TOPIC_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_MQTT_SUB_TOPIC_BUFFER_ID) < 0 { return -1; } @@ -393,7 +394,7 @@ unsafe extern "C" fn mqtt_parse_type(ustr: *const std::os::raw::c_char) -> *mut } unsafe extern "C" fn mqtt_type_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; @@ -425,7 +426,7 @@ unsafe extern "C" fn mqtt_type_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn mqtt_reason_code_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; @@ -483,7 +484,7 @@ unsafe extern "C" fn mqtt_parse_qos(ustr: *const std::os::raw::c_char) -> *mut u } unsafe extern "C" fn mqtt_qos_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; @@ -535,7 +536,7 @@ unsafe extern "C" fn mqtt_parse_bool(ustr: *const std::os::raw::c_char) -> *mut } unsafe extern "C" fn mqtt_connack_sessionpresent_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; @@ -584,12 +585,12 @@ unsafe extern "C" fn mqtt_connack_sessionpresent_free(_de: *mut c_void, ctx: *mu } unsafe extern "C" fn mqtt_pub_topic_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_MQTT_PUB_TOPIC_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_MQTT_PUB_TOPIC_BUFFER_ID) < 0 { return -1; } return 0; @@ -611,12 +612,12 @@ unsafe extern "C" fn mqtt_pub_topic_get_data( } unsafe extern "C" fn mqtt_pub_msg_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_MQTT_PUB_MSG_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_MQTT_PUB_MSG_BUFFER_ID) < 0 { return -1; } return 0; @@ -638,7 +639,7 @@ unsafe extern "C" fn mqtt_pub_msg_get_data( } unsafe extern "C" fn mqtt_protocol_version_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; @@ -745,7 +746,7 @@ unsafe extern "C" fn mqtt_parse_flags( } unsafe extern "C" fn mqtt_flags_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; @@ -858,7 +859,7 @@ unsafe extern "C" fn mqtt_parse_conn_flags( } unsafe extern "C" fn mqtt_conn_flags_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; @@ -908,12 +909,12 @@ unsafe extern "C" fn mqtt_conn_flags_free(_de: *mut c_void, ctx: *mut c_void) { } unsafe extern "C" fn mqtt_conn_willtopic_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_MQTT_CONN_WILLTOPIC_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_MQTT_CONN_WILLTOPIC_BUFFER_ID) < 0 { return -1; } return 0; @@ -935,12 +936,12 @@ unsafe extern "C" fn mqtt_conn_willtopic_get_data( } unsafe extern "C" fn mqtt_conn_willmsg_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_MQTT_CONN_WILLMSG_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_MQTT_CONN_WILLMSG_BUFFER_ID) < 0 { return -1; } return 0; @@ -962,12 +963,12 @@ unsafe extern "C" fn mqtt_conn_willmsg_get_data( } unsafe extern "C" fn mqtt_conn_username_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_MQTT_CONN_USERNAME_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_MQTT_CONN_USERNAME_BUFFER_ID) < 0 { return -1; } return 0; @@ -989,12 +990,12 @@ unsafe extern "C" fn mqtt_conn_username_get_data( } unsafe extern "C" fn mqtt_conn_protocolstring_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_MQTT_CONN_PROTOCOLSTRING_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_MQTT_CONN_PROTOCOLSTRING_BUFFER_ID) < 0 { return -1; } return 0; @@ -1016,12 +1017,12 @@ unsafe extern "C" fn mqtt_conn_protocolstring_get_data( } unsafe extern "C" fn mqtt_conn_password_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_MQTT_CONN_PASSWORD_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_MQTT_CONN_PASSWORD_BUFFER_ID) < 0 { return -1; } return 0; @@ -1043,12 +1044,12 @@ unsafe extern "C" fn mqtt_conn_password_get_data( } unsafe extern "C" fn mqtt_conn_clientid_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_MQTT_CONN_CLIENTID_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_MQTT_CONN_CLIENTID_BUFFER_ID) < 0 { return -1; } return 0; diff --git a/rust/src/rfb/detect.rs b/rust/src/rfb/detect.rs index 078e25ebdc..4aff66c210 100644 --- a/rust/src/rfb/detect.rs +++ b/rust/src/rfb/detect.rs @@ -23,14 +23,15 @@ use crate::detect::uint::{ detect_match_uint, detect_parse_uint_enum, DetectUintData, SCDetectU32Free, SCDetectU32Parse, }; use crate::detect::{ - helper_keyword_register_sticky_buffer, DetectBufferSetActiveList, - DetectHelperBufferMpmRegister, DetectHelperBufferRegister, DetectHelperGetData, - DetectHelperKeywordRegister, DetectSignatureSetAppProto, SCSigTableAppLiteElmt, - SigMatchAppendSMToList, SigTableElmtStickyBuffer, + helper_keyword_register_sticky_buffer, DetectHelperBufferMpmRegister, + DetectHelperBufferRegister, DetectHelperGetData, DetectHelperKeywordRegister, + DetectSignatureSetAppProto, SCSigTableAppLiteElmt, SigMatchAppendSMToList, + SigTableElmtStickyBuffer, }; use std::ffi::CStr; use std::os::raw::{c_int, c_void}; use std::ptr; +use suricata_sys::sys::{DetectEngineCtx, SCDetectBufferSetActiveList, Signature}; unsafe extern "C" fn rfb_name_get_data( tx: *const c_void, _flags: u8, buffer: *mut *const u8, buffer_len: *mut u32, @@ -72,19 +73,19 @@ static mut G_RFB_SEC_RESULT_KW_ID: c_int = 0; static mut G_RFB_SEC_RESULT_BUFFER_ID: c_int = 0; unsafe extern "C" fn rfb_name_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_RFB) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_RFB_NAME_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_RFB_NAME_BUFFER_ID) < 0 { return -1; } return 0; } unsafe extern "C" fn rfb_sec_type_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_RFB) != 0 { return -1; @@ -138,7 +139,7 @@ unsafe extern "C" fn rfb_parse_sec_result( } unsafe extern "C" fn rfb_sec_result_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_RFB) != 0 { return -1; diff --git a/rust/src/sdp/detect.rs b/rust/src/sdp/detect.rs index e26b3bf3eb..878e479abf 100644 --- a/rust/src/sdp/detect.rs +++ b/rust/src/sdp/detect.rs @@ -19,14 +19,14 @@ use crate::core::{DetectEngineThreadCtx, STREAM_TOCLIENT, STREAM_TOSERVER}; use crate::detect::{ - helper_keyword_register_sticky_buffer, DetectBufferSetActiveList, - DetectHelperBufferMpmRegister, DetectHelperGetData, DetectHelperMultiBufferMpmRegister, - DetectSignatureSetAppProto, SigTableElmtStickyBuffer, + helper_keyword_register_sticky_buffer, DetectHelperBufferMpmRegister, DetectHelperGetData, + DetectHelperMultiBufferMpmRegister, DetectSignatureSetAppProto, SigTableElmtStickyBuffer, }; use crate::direction::Direction; use crate::sip::sip::{SIPTransaction, ALPROTO_SIP}; use std::os::raw::{c_int, c_void}; use std::ptr; +use suricata_sys::sys::{DetectEngineCtx, SCDetectBufferSetActiveList, Signature}; static mut G_SDP_ORIGIN_BUFFER_ID: c_int = 0; static mut G_SDP_SESSION_NAME_BUFFER_ID: c_int = 0; @@ -47,12 +47,12 @@ static mut G_SDP_MEDIA_DESC_CONNECTION_DATA_BUFFER_ID: c_int = 0; static mut G_SDP_MEDIA_DESC_ENCRYPTION_KEY_BUFFER_ID: c_int = 0; unsafe extern "C" fn sdp_session_name_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_SESSION_NAME_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_SESSION_NAME_BUFFER_ID) < 0 { return -1; } return 0; @@ -95,12 +95,12 @@ unsafe extern "C" fn sdp_session_name_get_data( } unsafe extern "C" fn sdp_session_info_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_SESSION_INFO_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_SESSION_INFO_BUFFER_ID) < 0 { return -1; } return 0; @@ -142,12 +142,12 @@ unsafe extern "C" fn sdp_session_info_get_data( } unsafe extern "C" fn sdp_origin_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_ORIGIN_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_ORIGIN_BUFFER_ID) < 0 { return -1; } return 0; @@ -190,12 +190,12 @@ unsafe extern "C" fn sdp_origin_get_data( } unsafe extern "C" fn sdp_uri_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_URI_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_URI_BUFFER_ID) < 0 { return -1; } return 0; @@ -237,12 +237,12 @@ unsafe extern "C" fn sdp_uri_get_data( } unsafe extern "C" fn sdp_email_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_EMAIL_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_EMAIL_BUFFER_ID) < 0 { return -1; } return 0; @@ -284,12 +284,12 @@ unsafe extern "C" fn sdp_email_get_data( } unsafe extern "C" fn sdp_phone_number_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_PHONE_NUMBER_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_PHONE_NUMBER_BUFFER_ID) < 0 { return -1; } return 0; @@ -331,12 +331,12 @@ unsafe extern "C" fn sdp_phone_number_get_data( } unsafe extern "C" fn sdp_conn_data_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_CONNECTION_DATA_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_CONNECTION_DATA_BUFFER_ID) < 0 { return -1; } return 0; @@ -378,12 +378,12 @@ unsafe extern "C" fn sdp_conn_data_get_data( } unsafe extern "C" fn sdp_bandwidth_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_BANDWIDTH_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_BANDWIDTH_BUFFER_ID) < 0 { return -1; } return 0; @@ -415,12 +415,12 @@ unsafe extern "C" fn sip_bandwidth_get_data( } unsafe extern "C" fn sdp_time_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_TIME_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_TIME_BUFFER_ID) < 0 { return -1; } return 0; @@ -450,12 +450,12 @@ unsafe extern "C" fn sdp_time_get_data( } unsafe extern "C" fn sdp_repeat_time_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_REPEAT_TIME_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_REPEAT_TIME_BUFFER_ID) < 0 { return -1; } return 0; @@ -487,12 +487,12 @@ unsafe extern "C" fn sdp_repeat_time_get_data( } unsafe extern "C" fn sdp_timezone_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_TIMEZONE_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_TIMEZONE_BUFFER_ID) < 0 { return -1; } return 0; @@ -534,12 +534,12 @@ unsafe extern "C" fn sdp_timezone_get_data( } unsafe extern "C" fn sdp_encryption_key_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_ENCRYPTION_KEY_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_ENCRYPTION_KEY_BUFFER_ID) < 0 { return -1; } return 0; @@ -581,12 +581,12 @@ unsafe extern "C" fn sdp_encryption_key_get_data( } unsafe extern "C" fn sdp_attribute_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_ATTRIBUTE_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_ATTRIBUTE_BUFFER_ID) < 0 { return -1; } return 0; @@ -618,12 +618,12 @@ unsafe extern "C" fn sip_attribute_get_data( } unsafe extern "C" fn sdp_media_desc_media_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_MEDIA_DESC_MEDIA_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_MEDIA_DESC_MEDIA_BUFFER_ID) < 0 { return -1; } return 0; @@ -655,12 +655,12 @@ unsafe extern "C" fn sip_media_desc_media_get_data( } unsafe extern "C" fn sdp_media_desc_session_info_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_MEDIA_DESC_SESSION_INFO_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_MEDIA_DESC_SESSION_INFO_BUFFER_ID) < 0 { return -1; } return 0; @@ -693,12 +693,12 @@ unsafe extern "C" fn sip_media_desc_session_info_get_data( } unsafe extern "C" fn sdp_media_desc_connection_data_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_MEDIA_DESC_CONNECTION_DATA_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_MEDIA_DESC_CONNECTION_DATA_BUFFER_ID) < 0 { return -1; } return 0; @@ -731,12 +731,12 @@ unsafe extern "C" fn sip_media_desc_connection_data_get_data( } unsafe extern "C" fn sdp_media_desc_encryption_key_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SDP_MEDIA_DESC_ENCRYPTION_KEY_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SDP_MEDIA_DESC_ENCRYPTION_KEY_BUFFER_ID) < 0 { return -1; } return 0; @@ -886,7 +886,7 @@ pub unsafe extern "C" fn SCDetectSdpRegister() { b"sdp.bandwidth\0".as_ptr() as *const libc::c_char, b"sdp.bandwidth\0".as_ptr() as *const libc::c_char, ALPROTO_SIP, -STREAM_TOSERVER | STREAM_TOCLIENT, + STREAM_TOSERVER | STREAM_TOCLIENT, sip_bandwidth_get_data, ); let kw = SigTableElmtStickyBuffer { @@ -900,7 +900,7 @@ STREAM_TOSERVER | STREAM_TOCLIENT, b"sdp.time\0".as_ptr() as *const libc::c_char, b"sdp.time\0".as_ptr() as *const libc::c_char, ALPROTO_SIP, -STREAM_TOSERVER | STREAM_TOCLIENT, + STREAM_TOSERVER | STREAM_TOCLIENT, sdp_time_get_data, ); let kw = SigTableElmtStickyBuffer { @@ -914,7 +914,7 @@ STREAM_TOSERVER | STREAM_TOCLIENT, b"sdp.repeat_time\0".as_ptr() as *const libc::c_char, b"sdp.repeat_time\0".as_ptr() as *const libc::c_char, ALPROTO_SIP, -STREAM_TOSERVER | STREAM_TOCLIENT, + STREAM_TOSERVER | STREAM_TOCLIENT, sdp_repeat_time_get_data, ); let kw = SigTableElmtStickyBuffer { @@ -958,7 +958,7 @@ STREAM_TOSERVER | STREAM_TOCLIENT, b"sdp.attribute\0".as_ptr() as *const libc::c_char, b"sdp.attribute\0".as_ptr() as *const libc::c_char, ALPROTO_SIP, -STREAM_TOSERVER | STREAM_TOCLIENT, + STREAM_TOSERVER | STREAM_TOCLIENT, sip_attribute_get_data, ); let kw = SigTableElmtStickyBuffer { @@ -974,7 +974,7 @@ STREAM_TOSERVER | STREAM_TOCLIENT, b"sdp.media.media\0".as_ptr() as *const libc::c_char, b"sdp.media.media\0".as_ptr() as *const libc::c_char, ALPROTO_SIP, -STREAM_TOSERVER | STREAM_TOCLIENT, + STREAM_TOSERVER | STREAM_TOCLIENT, sip_media_desc_media_get_data, ); let kw = SigTableElmtStickyBuffer { @@ -988,7 +988,7 @@ STREAM_TOSERVER | STREAM_TOCLIENT, b"sdp.media.media_info\0".as_ptr() as *const libc::c_char, b"sdp.media.media_info\0".as_ptr() as *const libc::c_char, ALPROTO_SIP, -STREAM_TOSERVER | STREAM_TOCLIENT, + STREAM_TOSERVER | STREAM_TOCLIENT, sip_media_desc_session_info_get_data, ); let kw = SigTableElmtStickyBuffer { @@ -1002,7 +1002,7 @@ STREAM_TOSERVER | STREAM_TOCLIENT, b"sdp.media.connection_data\0".as_ptr() as *const libc::c_char, b"sdp.media.connection_data\0".as_ptr() as *const libc::c_char, ALPROTO_SIP, -STREAM_TOSERVER | STREAM_TOCLIENT, + STREAM_TOSERVER | STREAM_TOCLIENT, sip_media_desc_connection_data_get_data, ); let kw = SigTableElmtStickyBuffer { @@ -1016,7 +1016,7 @@ STREAM_TOSERVER | STREAM_TOCLIENT, b"sdp.media.encryption_key\0".as_ptr() as *const libc::c_char, b"sdp.media.encryption_key\0".as_ptr() as *const libc::c_char, ALPROTO_SIP, -STREAM_TOSERVER | STREAM_TOCLIENT, + STREAM_TOSERVER | STREAM_TOCLIENT, sip_media_desc_encryption_key_get_data, ); } diff --git a/rust/src/sip/detect.rs b/rust/src/sip/detect.rs index 371f517d0c..7699d7a510 100644 --- a/rust/src/sip/detect.rs +++ b/rust/src/sip/detect.rs @@ -19,14 +19,14 @@ use crate::core::{DetectEngineThreadCtx, STREAM_TOCLIENT, STREAM_TOSERVER}; use crate::detect::{ - helper_keyword_register_sticky_buffer, DetectBufferSetActiveList, - DetectHelperBufferMpmRegister, DetectHelperGetData, DetectHelperMultiBufferMpmRegister, - DetectSignatureSetAppProto, SigTableElmtStickyBuffer, + helper_keyword_register_sticky_buffer, DetectHelperBufferMpmRegister, DetectHelperGetData, + DetectHelperMultiBufferMpmRegister, DetectSignatureSetAppProto, SigTableElmtStickyBuffer, }; use crate::direction::Direction; use crate::sip::sip::{SIPTransaction, ALPROTO_SIP}; use std::os::raw::{c_int, c_void}; use std::ptr; +use suricata_sys::sys::{DetectEngineCtx, SCDetectBufferSetActiveList, Signature}; static mut G_SIP_PROTOCOL_BUFFER_ID: c_int = 0; static mut G_SIP_STAT_CODE_BUFFER_ID: c_int = 0; @@ -79,12 +79,12 @@ pub unsafe extern "C" fn rs_sip_tx_get_uri( } unsafe extern "C" fn sip_protocol_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SIP_PROTOCOL_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SIP_PROTOCOL_BUFFER_ID) < 0 { return -1; } return 0; @@ -137,12 +137,12 @@ unsafe extern "C" fn sip_protocol_get_data( } unsafe extern "C" fn sip_stat_code_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SIP_STAT_CODE_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SIP_STAT_CODE_BUFFER_ID) < 0 { return -1; } return 0; @@ -181,12 +181,12 @@ unsafe extern "C" fn sip_stat_code_get_data( } unsafe extern "C" fn sip_stat_msg_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SIP_STAT_MSG_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SIP_STAT_MSG_BUFFER_ID) < 0 { return -1; } return 0; @@ -224,12 +224,12 @@ unsafe extern "C" fn sip_stat_msg_get_data( } unsafe extern "C" fn sip_request_line_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SIP_REQUEST_LINE_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SIP_REQUEST_LINE_BUFFER_ID) < 0 { return -1; } return 0; @@ -267,12 +267,12 @@ unsafe extern "C" fn sip_request_line_get_data( } unsafe extern "C" fn sip_response_line_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SIP_RESPONSE_LINE_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SIP_RESPONSE_LINE_BUFFER_ID) < 0 { return -1; } return 0; @@ -328,12 +328,12 @@ fn sip_get_header_value<'a>( } unsafe extern "C" fn sip_from_hdr_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SIP_FROM_HDR_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SIP_FROM_HDR_BUFFER_ID) < 0 { return -1; } return 0; @@ -355,12 +355,12 @@ unsafe extern "C" fn sip_from_hdr_get_data( } unsafe extern "C" fn sip_to_hdr_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SIP_TO_HDR_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SIP_TO_HDR_BUFFER_ID) < 0 { return -1; } return 0; @@ -382,12 +382,12 @@ unsafe extern "C" fn sip_to_hdr_get_data( } unsafe extern "C" fn sip_via_hdr_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SIP_VIA_HDR_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SIP_VIA_HDR_BUFFER_ID) < 0 { return -1; } return 0; @@ -409,12 +409,12 @@ unsafe extern "C" fn sip_via_hdr_get_data( } unsafe extern "C" fn sip_ua_hdr_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SIP_UA_HDR_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SIP_UA_HDR_BUFFER_ID) < 0 { return -1; } return 0; @@ -436,12 +436,12 @@ unsafe extern "C" fn sip_ua_hdr_get_data( } unsafe extern "C" fn sip_content_type_hdr_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SIP_CONTENT_TYPE_HDR_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SIP_CONTENT_TYPE_HDR_BUFFER_ID) < 0 { return -1; } return 0; @@ -463,12 +463,12 @@ unsafe extern "C" fn sip_content_type_hdr_get_data( } unsafe extern "C" fn sip_content_length_hdr_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SIP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SIP_CONTENT_LENGTH_HDR_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SIP_CONTENT_LENGTH_HDR_BUFFER_ID) < 0 { return -1; } return 0; diff --git a/rust/src/snmp/detect.rs b/rust/src/snmp/detect.rs index e4a9e18369..fd5cd548f4 100644 --- a/rust/src/snmp/detect.rs +++ b/rust/src/snmp/detect.rs @@ -20,12 +20,13 @@ use super::snmp::{SNMPTransaction, ALPROTO_SNMP}; use crate::detect::uint::{DetectUintData, SCDetectU32Free, SCDetectU32Match, SCDetectU32Parse}; use crate::detect::{ - helper_keyword_register_sticky_buffer, DetectBufferSetActiveList, - DetectHelperBufferMpmRegister, DetectHelperBufferRegister, DetectHelperGetData, - DetectHelperKeywordRegister, DetectSignatureSetAppProto, SCSigTableAppLiteElmt, - SigMatchAppendSMToList, SigTableElmtStickyBuffer, + helper_keyword_register_sticky_buffer, DetectHelperBufferMpmRegister, + DetectHelperBufferRegister, DetectHelperGetData, DetectHelperKeywordRegister, + DetectSignatureSetAppProto, SCSigTableAppLiteElmt, SigMatchAppendSMToList, + SigTableElmtStickyBuffer, }; use std::os::raw::{c_int, c_void}; +use suricata_sys::sys::{DetectEngineCtx, SCDetectBufferSetActiveList, Signature}; static mut G_SNMP_VERSION_KW_ID: c_int = 0; static mut G_SNMP_VERSION_BUFFER_ID: c_int = 0; @@ -35,7 +36,7 @@ static mut G_SNMP_USM_BUFFER_ID: c_int = 0; static mut G_SNMP_COMMUNITY_BUFFER_ID: c_int = 0; unsafe extern "C" fn snmp_detect_version_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SNMP) != 0 { return -1; @@ -68,7 +69,7 @@ unsafe extern "C" fn snmp_detect_version_free(_de: *mut c_void, ctx: *mut c_void } unsafe extern "C" fn snmp_detect_pdutype_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SNMP) != 0 { return -1; @@ -105,12 +106,12 @@ unsafe extern "C" fn snmp_detect_pdutype_free(_de: *mut c_void, ctx: *mut c_void } unsafe extern "C" fn snmp_detect_usm_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SNMP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SNMP_USM_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SNMP_USM_BUFFER_ID) < 0 { return -1; } return 0; @@ -144,12 +145,12 @@ unsafe extern "C" fn snmp_detect_usm_get_data( } unsafe extern "C" fn snmp_detect_community_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_SNMP) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_SNMP_COMMUNITY_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_SNMP_COMMUNITY_BUFFER_ID) < 0 { return -1; } return 0; diff --git a/rust/src/websocket/detect.rs b/rust/src/websocket/detect.rs index 09e2235c33..680f520fbb 100644 --- a/rust/src/websocket/detect.rs +++ b/rust/src/websocket/detect.rs @@ -21,12 +21,13 @@ use crate::detect::uint::{ SCDetectU32Match, SCDetectU32Parse, SCDetectU8Free, SCDetectU8Match, }; use crate::detect::{ - helper_keyword_register_sticky_buffer, DetectBufferSetActiveList, - DetectHelperBufferMpmRegister, DetectHelperBufferRegister, DetectHelperGetData, - DetectHelperKeywordRegister, DetectSignatureSetAppProto, SCSigTableAppLiteElmt, - SigMatchAppendSMToList, SigTableElmtStickyBuffer, + helper_keyword_register_sticky_buffer, DetectHelperBufferMpmRegister, + DetectHelperBufferRegister, DetectHelperGetData, DetectHelperKeywordRegister, + DetectSignatureSetAppProto, SCSigTableAppLiteElmt, SigMatchAppendSMToList, + SigTableElmtStickyBuffer, }; use crate::websocket::parser::WebSocketOpcode; +use suricata_sys::sys::{DetectEngineCtx, SCDetectBufferSetActiveList, Signature}; use nom7::branch::alt; use nom7::bytes::complete::{is_a, tag}; @@ -119,7 +120,7 @@ static mut G_WEBSOCKET_FLAGS_BUFFER_ID: c_int = 0; static mut G_WEBSOCKET_PAYLOAD_BUFFER_ID: c_int = 0; unsafe extern "C" fn websocket_detect_opcode_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_WEBSOCKET) != 0 { return -1; @@ -159,7 +160,7 @@ unsafe extern "C" fn websocket_detect_opcode_free(_de: *mut c_void, ctx: *mut c_ } unsafe extern "C" fn websocket_detect_mask_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_WEBSOCKET) != 0 { return -1; @@ -202,7 +203,7 @@ unsafe extern "C" fn websocket_detect_mask_free(_de: *mut c_void, ctx: *mut c_vo } unsafe extern "C" fn websocket_detect_flags_setup( - de: *mut c_void, s: *mut c_void, raw: *const libc::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, raw: *const libc::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_WEBSOCKET) != 0 { return -1; @@ -242,12 +243,12 @@ unsafe extern "C" fn websocket_detect_flags_free(_de: *mut c_void, ctx: *mut c_v } pub unsafe extern "C" fn websocket_detect_payload_setup( - de: *mut c_void, s: *mut c_void, _raw: *const std::os::raw::c_char, + de: *mut DetectEngineCtx, s: *mut Signature, _raw: *const std::os::raw::c_char, ) -> c_int { if DetectSignatureSetAppProto(s, ALPROTO_WEBSOCKET) != 0 { return -1; } - if DetectBufferSetActiveList(de, s, G_WEBSOCKET_PAYLOAD_BUFFER_ID) < 0 { + if SCDetectBufferSetActiveList(de, s, G_WEBSOCKET_PAYLOAD_BUFFER_ID) < 0 { return -1; } return 0; diff --git a/rust/sys/src/sys.rs b/rust/sys/src/sys.rs index ea49e7a6de..d8d120d6db 100644 --- a/rust/sys/src/sys.rs +++ b/rust/sys/src/sys.rs @@ -176,6 +176,23 @@ extern "C" { KeywordsRegister: ::std::option::Option, ) -> ::std::os::raw::c_int; } +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct DetectEngineCtx_ { + _unused: [u8; 0], +} +pub type DetectEngineCtx = DetectEngineCtx_; +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct Signature_ { + _unused: [u8; 0], +} +pub type Signature = Signature_; +extern "C" { + pub fn SCDetectBufferSetActiveList( + de_ctx: *mut DetectEngineCtx, s: *mut Signature, list: ::std::os::raw::c_int, + ) -> ::std::os::raw::c_int; +} #[doc = " Structure of a configuration parameter."] #[repr(C)] #[derive(Debug, Copy, Clone)] diff --git a/src/bindgen.h b/src/bindgen.h index 6ff6dc038a..eabb72e9c1 100644 --- a/src/bindgen.h +++ b/src/bindgen.h @@ -29,10 +29,13 @@ #include "stdint.h" #include "stdbool.h" +#define WARN_UNUSED + #include "app-layer-protos.h" #include "suricata-plugin.h" #include "output-eve-bindgen.h" #include "detect-engine-register.h" +#include "detect-engine-buffer.h" #include "conf.h" diff --git a/src/detect-dce-stub-data.c b/src/detect-dce-stub-data.c index 81d9ce8fb0..f1ea7b0e10 100644 --- a/src/detect-dce-stub-data.c +++ b/src/detect-dce-stub-data.c @@ -161,7 +161,7 @@ static int DetectDceStubDataSetup(DetectEngineCtx *de_ctx, Signature *s, const c { if (DetectSignatureSetAppProto(s, ALPROTO_DCERPC) < 0) return -1; - if (DetectBufferSetActiveList(de_ctx, s, g_dce_stub_data_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 cde1560b16..f25fa420ac 100644 --- a/src/detect-dnp3.c +++ b/src/detect-dnp3.c @@ -512,7 +512,7 @@ static int DetectDNP3DataSetup(DetectEngineCtx *de_ctx, Signature *s, const char if (DetectSignatureSetAppProto(s, ALPROTO_DNP3) != 0) return -1; - if (DetectBufferSetActiveList(de_ctx, s, g_dnp3_data_buffer_id) != 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_dnp3_data_buffer_id) != 0) return -1; SCReturnInt(0); diff --git a/src/detect-dns-name.c b/src/detect-dns-name.c index 83e045c95d..75f2b53b65 100644 --- a/src/detect-dns-name.c +++ b/src/detect-dns-name.c @@ -48,7 +48,7 @@ static int additional_buffer_id = 0; static int DetectSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str, int id) { - if (DetectBufferSetActiveList(de_ctx, s, id) < 0) { + if (SCDetectBufferSetActiveList(de_ctx, s, id) < 0) { return -1; } if (DetectSignatureSetAppProto(s, ALPROTO_DNS) < 0) { diff --git a/src/detect-dns-response.c b/src/detect-dns-response.c index 121a003119..54fcf745b9 100644 --- a/src/detect-dns-response.c +++ b/src/detect-dns-response.c @@ -56,7 +56,7 @@ struct DnsResponseGetDataArgs { static int DetectSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, detect_buffer_id) < 0) { + if (SCDetectBufferSetActiveList(de_ctx, s, detect_buffer_id) < 0) { return -1; } if (DetectSignatureSetAppProto(s, ALPROTO_DNS) < 0) { diff --git a/src/detect-email.c b/src/detect-email.c index 9e64e1d4d2..c9bb66d7f0 100644 --- a/src/detect-email.c +++ b/src/detect-email.c @@ -36,7 +36,7 @@ static int g_mime_email_received_buffer_id = 0; static int DetectMimeEmailFromSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_mime_email_from_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_mime_email_from_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_SMTP) < 0) @@ -70,7 +70,7 @@ static InspectionBuffer *GetMimeEmailFromData(DetectEngineThreadCtx *det_ctx, static int DetectMimeEmailSubjectSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_mime_email_subject_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_mime_email_subject_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_SMTP) < 0) @@ -105,7 +105,7 @@ static InspectionBuffer *GetMimeEmailSubjectData(DetectEngineThreadCtx *det_ctx, static int DetectMimeEmailToSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_mime_email_to_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_mime_email_to_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_SMTP) < 0) @@ -141,7 +141,7 @@ static InspectionBuffer *GetMimeEmailToData(DetectEngineThreadCtx *det_ctx, static int DetectMimeEmailCcSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_mime_email_cc_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_mime_email_cc_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_SMTP) < 0) @@ -175,7 +175,7 @@ static InspectionBuffer *GetMimeEmailCcData(DetectEngineThreadCtx *det_ctx, static int DetectMimeEmailDateSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_mime_email_date_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_mime_email_date_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_SMTP) < 0) @@ -209,7 +209,7 @@ static InspectionBuffer *GetMimeEmailDateData(DetectEngineThreadCtx *det_ctx, static int DetectMimeEmailMessageIdSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_mime_email_message_id_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_mime_email_message_id_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_SMTP) < 0) @@ -244,7 +244,7 @@ static InspectionBuffer *GetMimeEmailMessageIdData(DetectEngineThreadCtx *det_ct static int DetectMimeEmailXMailerSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_mime_email_x_mailer_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_mime_email_x_mailer_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_SMTP) < 0) @@ -279,7 +279,7 @@ static InspectionBuffer *GetMimeEmailXMailerData(DetectEngineThreadCtx *det_ctx, static int DetectMimeEmailUrlSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_mime_email_url_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_mime_email_url_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_SMTP) < 0) @@ -304,7 +304,7 @@ static bool GetMimeEmailUrlData(DetectEngineThreadCtx *det_ctx, const void *txv, static int DetectMimeEmailReceivedSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_mime_email_received_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_mime_email_received_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_SMTP) < 0) @@ -335,7 +335,7 @@ void DetectEmailRegister(void) kw.name = "email.from"; kw.desc = "'From' field from an email"; kw.url = "/rules/email-keywords.html#email.from"; - kw.Setup = (int (*)(void *, void *, const char *))DetectMimeEmailFromSetup; + kw.Setup = DetectMimeEmailFromSetup; kw.flags = SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; DetectHelperKeywordRegister(&kw); g_mime_email_from_buffer_id = @@ -346,7 +346,7 @@ void DetectEmailRegister(void) kw.name = "email.subject"; kw.desc = "'Subject' field from an email"; kw.url = "/rules/email-keywords.html#email.subject"; - kw.Setup = (int (*)(void *, void *, const char *))DetectMimeEmailSubjectSetup; + kw.Setup = DetectMimeEmailSubjectSetup; kw.flags = SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; DetectHelperKeywordRegister(&kw); g_mime_email_subject_buffer_id = DetectHelperBufferMpmRegister("email.subject", @@ -357,7 +357,7 @@ void DetectEmailRegister(void) kw.name = "email.to"; kw.desc = "'To' field from an email"; kw.url = "/rules/email-keywords.html#email.to"; - kw.Setup = (int (*)(void *, void *, const char *))DetectMimeEmailToSetup; + kw.Setup = DetectMimeEmailToSetup; kw.flags = SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; DetectHelperKeywordRegister(&kw); g_mime_email_to_buffer_id = @@ -368,7 +368,7 @@ void DetectEmailRegister(void) kw.name = "email.cc"; kw.desc = "'Cc' field from an email"; kw.url = "/rules/email-keywords.html#email.cc"; - kw.Setup = (int (*)(void *, void *, const char *))DetectMimeEmailCcSetup; + kw.Setup = DetectMimeEmailCcSetup; kw.flags = SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; DetectHelperKeywordRegister(&kw); g_mime_email_cc_buffer_id = @@ -379,7 +379,7 @@ void DetectEmailRegister(void) kw.name = "email.date"; kw.desc = "'Date' field from an email"; kw.url = "/rules/email-keywords.html#email.date"; - kw.Setup = (int (*)(void *, void *, const char *))DetectMimeEmailDateSetup; + kw.Setup = DetectMimeEmailDateSetup; kw.flags = SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; DetectHelperKeywordRegister(&kw); g_mime_email_date_buffer_id = @@ -390,7 +390,7 @@ void DetectEmailRegister(void) kw.name = "email.message_id"; kw.desc = "'Message-Id' field from an email"; kw.url = "/rules/email-keywords.html#email.message_id"; - kw.Setup = (int (*)(void *, void *, const char *))DetectMimeEmailMessageIdSetup; + kw.Setup = DetectMimeEmailMessageIdSetup; kw.flags = SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; DetectHelperKeywordRegister(&kw); g_mime_email_message_id_buffer_id = DetectHelperBufferMpmRegister("email.message_id", @@ -401,7 +401,7 @@ void DetectEmailRegister(void) kw.name = "email.x_mailer"; kw.desc = "'X-Mailer' field from an email"; kw.url = "/rules/email-keywords.html#email.x_mailer"; - kw.Setup = (int (*)(void *, void *, const char *))DetectMimeEmailXMailerSetup; + kw.Setup = DetectMimeEmailXMailerSetup; kw.flags = SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; DetectHelperKeywordRegister(&kw); g_mime_email_x_mailer_buffer_id = DetectHelperBufferMpmRegister("email.x_mailer", @@ -412,7 +412,7 @@ void DetectEmailRegister(void) kw.name = "email.url"; kw.desc = "'Url' extracted from an email"; kw.url = "/rules/email-keywords.html#email.url"; - kw.Setup = (int (*)(void *, void *, const char *))DetectMimeEmailUrlSetup; + kw.Setup = DetectMimeEmailUrlSetup; kw.flags = SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; DetectHelperKeywordRegister(&kw); g_mime_email_url_buffer_id = DetectHelperMultiBufferMpmRegister( @@ -421,7 +421,7 @@ void DetectEmailRegister(void) kw.name = "email.received"; kw.desc = "'Received' field from an email"; kw.url = "/rules/email-keywords.html#email.received"; - kw.Setup = (int (*)(void *, void *, const char *))DetectMimeEmailReceivedSetup; + kw.Setup = DetectMimeEmailReceivedSetup; kw.flags = SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; DetectHelperKeywordRegister(&kw); g_mime_email_received_buffer_id = DetectHelperMultiBufferMpmRegister("email.received", diff --git a/src/detect-engine-buffer.c b/src/detect-engine-buffer.c index 4cb359b783..2026480e56 100644 --- a/src/detect-engine-buffer.c +++ b/src/detect-engine-buffer.c @@ -26,7 +26,7 @@ #include "detect-parse.h" #include "detect-engine-buffer.h" -int DetectBufferSetActiveList(DetectEngineCtx *de_ctx, Signature *s, const int list) +int SCDetectBufferSetActiveList(DetectEngineCtx *de_ctx, Signature *s, const int list) { BUG_ON(s->init_data == NULL); diff --git a/src/detect-engine-buffer.h b/src/detect-engine-buffer.h index 5031ee4958..aa2ecd6369 100644 --- a/src/detect-engine-buffer.h +++ b/src/detect-engine-buffer.h @@ -24,9 +24,13 @@ #ifndef SURICATA_DETECT_ENGINE_BUFFER_H #define SURICATA_DETECT_ENGINE_BUFFER_H -#include "detect.h" +// types from detect.h with only forward declarations for bindgen +// could be #ifndef SURICATA_BINDGEN_H #include "detect.h" #endif +typedef struct DetectEngineCtx_ DetectEngineCtx; +typedef struct Signature_ Signature; +typedef struct SigMatch_ SigMatch; -int WARN_UNUSED DetectBufferSetActiveList(DetectEngineCtx *de_ctx, Signature *s, const int list); +int WARN_UNUSED SCDetectBufferSetActiveList(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 011b4c4f78..fb79b2bf50 100644 --- a/src/detect-file-data.c +++ b/src/detect-file-data.c @@ -153,7 +153,7 @@ static int DetectFiledataSetup (DetectEngineCtx *de_ctx, Signature *s, const cha return -1; } - if (DetectBufferSetActiveList(de_ctx, s, DetectBufferTypeGetByName("file_data")) < 0) + if (SCDetectBufferSetActiveList(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 316320ba13..26ce0cc7cf 100644 --- a/src/detect-filemagic.c +++ b/src/detect-filemagic.c @@ -254,7 +254,7 @@ static int DetectFilemagicSetupSticky(DetectEngineCtx *de_ctx, Signature *s, con SCLogError("file.magic failed to setup direction"); return -1; } - if (DetectBufferSetActiveList(de_ctx, s, g_file_magic_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_file_magic_buffer_id) < 0) return -1; if (de_ctx->filemagic_thread_ctx_id == -1) { diff --git a/src/detect-filename.c b/src/detect-filename.c index df9ba98d0c..bf23e23916 100644 --- a/src/detect-filename.c +++ b/src/detect-filename.c @@ -212,7 +212,7 @@ static int DetectFilenameSetupSticky(DetectEngineCtx *de_ctx, Signature *s, cons SCLogError("file.name failed to setup direction"); return -1; } - if (DetectBufferSetActiveList(de_ctx, s, g_file_name_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 7e93b70267..749fd02e2c 100644 --- a/src/detect-frame.c +++ b/src/detect-frame.c @@ -139,7 +139,7 @@ static int DetectFrameSetup(DetectEngineCtx *de_ctx, Signature *s, const char *s if (buffer_id < 0) return -1; - if (DetectBufferSetActiveList(de_ctx, s, buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, buffer_id) < 0) return -1; FrameConfigEnable(keyword_alproto, frame_type); diff --git a/src/detect-ftp-command-data.c b/src/detect-ftp-command-data.c index 54553ce8f6..f940ab5d83 100644 --- a/src/detect-ftp-command-data.c +++ b/src/detect-ftp-command-data.c @@ -52,7 +52,7 @@ static int g_ftp_cmd_data_buffer_id = 0; static int DetectFtpCommandDataSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_ftp_cmd_data_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_ftp_cmd_data_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_FTP) < 0) diff --git a/src/detect-ftp-command.c b/src/detect-ftp-command.c index 521d0671f7..97b78b7fec 100644 --- a/src/detect-ftp-command.c +++ b/src/detect-ftp-command.c @@ -51,7 +51,7 @@ static int g_ftp_cmd_buffer_id = 0; static int DetectFtpCommandSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_ftp_cmd_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_ftp_cmd_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_FTP) < 0) diff --git a/src/detect-ftp-reply.c b/src/detect-ftp-reply.c index 1fd7a9a463..1173801a4c 100644 --- a/src/detect-ftp-reply.c +++ b/src/detect-ftp-reply.c @@ -51,7 +51,7 @@ static int g_ftp_reply_buffer_id = 0; static int DetectFtpReplySetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_ftp_reply_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_ftp_reply_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_FTP) < 0) diff --git a/src/detect-http-client-body.c b/src/detect-http-client-body.c index 00ed170ee5..f0d589563d 100644 --- a/src/detect-http-client-body.c +++ b/src/detect-http-client-body.c @@ -165,7 +165,7 @@ int DetectHttpClientBodySetup(DetectEngineCtx *de_ctx, Signature *s, const char */ static int DetectHttpClientBodySetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_client_body_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_http_client_body_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0) return -1; diff --git a/src/detect-http-cookie.c b/src/detect-http-cookie.c index f56c28567b..bfa58f3608 100644 --- a/src/detect-http-cookie.c +++ b/src/detect-http-cookie.c @@ -162,7 +162,7 @@ static int DetectHttpCookieSetup(DetectEngineCtx *de_ctx, Signature *s, const ch */ static int DetectHttpCookieSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_cookie_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 3eb5406e41..ebd36282d0 100644 --- 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(de_ctx, s, g_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 3efcc16f10..d2add08f11 100644 --- a/src/detect-http-header.c +++ b/src/detect-http-header.c @@ -390,7 +390,7 @@ static int DetectHttpHeaderSetup(DetectEngineCtx *de_ctx, Signature *s, const ch */ static int DetectHttpHeaderSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_header_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_http_header_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0) return -1; @@ -572,7 +572,7 @@ static bool GetHttp1HeaderData(DetectEngineThreadCtx *det_ctx, const void *txv, static int DetectHTTPRequestHeaderSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_request_header_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_http_request_header_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) != 0) @@ -605,7 +605,7 @@ void DetectHttpRequestHeaderRegister(void) static int DetectHTTPResponseHeaderSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_response_header_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_http_response_header_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) != 0) diff --git a/src/detect-http-headers-stub.h b/src/detect-http-headers-stub.h index 2dafa0d82b..da74c0266e 100644 --- a/src/detect-http-headers-stub.h +++ b/src/detect-http-headers-stub.h @@ -167,7 +167,7 @@ static int DetectHttpHeadersSetupSticky(DetectEngineCtx *de_ctx, Signature *s, c return -1; } - if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0) return -1; s->init_data->init_flags &= ~SIG_FLAG_INIT_FORCE_TOSERVER; diff --git a/src/detect-http-host.c b/src/detect-http-host.c index 4f107945e4..1d0b39e0e3 100644 --- a/src/detect-http-host.c +++ b/src/detect-http-host.c @@ -233,7 +233,7 @@ static bool DetectHttpHostValidateCallback( */ static int DetectHttpHostSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_host_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_http_host_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0) return -1; @@ -331,7 +331,7 @@ int DetectHttpHRHSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) */ static int DetectHttpHostRawSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_raw_host_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 52e10138c7..732b46b133 100644 --- a/src/detect-http-method.c +++ b/src/detect-http-method.c @@ -151,7 +151,7 @@ static int DetectHttpMethodSetup(DetectEngineCtx *de_ctx, Signature *s, const ch */ static int DetectHttpMethodSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_method_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 56eb2e2a53..3c298f5ee1 100644 --- a/src/detect-http-protocol.c +++ b/src/detect-http-protocol.c @@ -73,7 +73,7 @@ static int g_buffer_id = 0; static int DetectHttpProtocolSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0) diff --git a/src/detect-http-raw-header.c b/src/detect-http-raw-header.c index 5f6e38b6fe..682bb29a61 100644 --- a/src/detect-http-raw-header.c +++ b/src/detect-http-raw-header.c @@ -161,7 +161,7 @@ int DetectHttpRawHeaderSetup(DetectEngineCtx *de_ctx, Signature *s, const char * */ static int DetectHttpRawHeaderSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_raw_header_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 2edd79aef1..bd997fe867 100644 --- a/src/detect-http-request-line.c +++ b/src/detect-http-request-line.c @@ -142,7 +142,7 @@ void DetectHttpRequestLineRegister(void) */ static int DetectHttpRequestLineSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_request_line_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_http_request_line_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0) diff --git a/src/detect-http-response-line.c b/src/detect-http-response-line.c index 72a5eda92d..fae4b1ad49 100644 --- a/src/detect-http-response-line.c +++ b/src/detect-http-response-line.c @@ -141,7 +141,7 @@ void DetectHttpResponseLineRegister(void) */ static int DetectHttpResponseLineSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_response_line_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_http_response_line_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0) diff --git a/src/detect-http-server-body.c b/src/detect-http-server-body.c index 6cdb639944..decb68f1f6 100644 --- a/src/detect-http-server-body.c +++ b/src/detect-http-server-body.c @@ -122,7 +122,7 @@ int DetectHttpServerBodySetup(DetectEngineCtx *de_ctx, Signature *s, const char */ static int DetectHttpServerBodySetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0) return -1; diff --git a/src/detect-http-start.c b/src/detect-http-start.c index 85d9a493de..eb36797a3c 100644 --- a/src/detect-http-start.c +++ b/src/detect-http-start.c @@ -168,7 +168,7 @@ static InspectionBuffer *GetBuffer1ForTX(DetectEngineThreadCtx *det_ctx, static int DetectHttpStartSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 646bb8d19a..a66a1e99f3 100644 --- a/src/detect-http-stat-code.c +++ b/src/detect-http-stat-code.c @@ -147,7 +147,7 @@ static int DetectHttpStatCodeSetup(DetectEngineCtx *de_ctx, Signature *s, const */ static int DetectHttpStatCodeSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_stat_code_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 8f3ba31280..c96c73c422 100644 --- a/src/detect-http-stat-msg.c +++ b/src/detect-http-stat-msg.c @@ -156,7 +156,7 @@ static int DetectHttpStatMsgSetup(DetectEngineCtx *de_ctx, Signature *s, const c */ static int DetectHttpStatMsgSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_stat_msg_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_http_stat_msg_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0) return -1; diff --git a/src/detect-http-ua.c b/src/detect-http-ua.c index 0a3a544be2..7bd6b48dca 100644 --- a/src/detect-http-ua.c +++ b/src/detect-http-ua.c @@ -148,7 +148,7 @@ int DetectHttpUASetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) */ static int DetectHttpUserAgentSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_ua_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 d90ca641ec..0686a7b797 100644 --- a/src/detect-http-uri.c +++ b/src/detect-http-uri.c @@ -201,7 +201,7 @@ static void DetectHttpUriSetupCallback(const DetectEngineCtx *de_ctx, */ static int DetectHttpUriSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_uri_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_http_uri_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_HTTP) < 0) return -1; @@ -287,7 +287,7 @@ static void DetectHttpRawUriSetupCallback(const DetectEngineCtx *de_ctx, */ static int DetectHttpRawUriSetupSticky(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_http_raw_uri_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 28585dc86d..b00f227c5d 100644 --- a/src/detect-http2.c +++ b/src/detect-http2.c @@ -581,7 +581,7 @@ void DetectHTTP2settingsFree(DetectEngineCtx *de_ctx, void *ptr) static int DetectHTTP2headerNameSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_http2_header_name_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_http2_header_name_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_HTTP2) != 0) diff --git a/src/detect-icmpv4hdr.c b/src/detect-icmpv4hdr.c index c70d88f911..b594ab5ad4 100644 --- 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(de_ctx, s, g_icmpv4hdr_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 31331328c1..e7708c2d6b 100644 --- a/src/detect-icmpv6hdr.c +++ b/src/detect-icmpv6hdr.c @@ -89,7 +89,7 @@ static int DetectICMPv6hdrSetup (DetectEngineCtx *de_ctx, Signature *s, const ch s->flags |= SIG_FLAG_REQUIRE_PACKET; - if (DetectBufferSetActiveList(de_ctx, s, g_icmpv6hdr_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 6de0180dd9..a76532388a 100644 --- a/src/detect-ike-key-exchange-payload.c +++ b/src/detect-ike-key-exchange-payload.c @@ -60,7 +60,7 @@ static int g_buffer_key_exchange_id = 0; static int DetectKeyExchangeSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_buffer_key_exchange_id) < 0) + if (SCDetectBufferSetActiveList(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 5de3dbc27e..692962c2c8 100644 --- a/src/detect-ike-nonce-payload.c +++ b/src/detect-ike-nonce-payload.c @@ -60,7 +60,7 @@ static int g_buffer_nonce_id = 0; static int DetectNonceSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_buffer_nonce_id) < 0) + if (SCDetectBufferSetActiveList(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 9f1311c85b..a8e5a54751 100644 --- a/src/detect-ike-spi.c +++ b/src/detect-ike-spi.c @@ -66,7 +66,7 @@ static int g_buffer_responder_id = 0; static int DetectSpiInitiatorSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_buffer_initiator_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_buffer_initiator_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_IKE) < 0) @@ -77,7 +77,7 @@ static int DetectSpiInitiatorSetup(DetectEngineCtx *de_ctx, Signature *s, const static int DetectSpiResponderSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_buffer_responder_id) < 0) + if (SCDetectBufferSetActiveList(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 0097b37a9c..fe264bb390 100644 --- a/src/detect-ike-vendor.c +++ b/src/detect-ike-vendor.c @@ -73,7 +73,7 @@ void DetectIkeVendorRegister(void) static int DetectIkeVendorSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_ike_vendor_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 a9a5ed1baa..b405d3bbf9 100644 --- a/src/detect-ipv4hdr.c +++ b/src/detect-ipv4hdr.c @@ -85,7 +85,7 @@ static int DetectIpv4hdrSetup (DetectEngineCtx *de_ctx, Signature *s, const char s->flags |= SIG_FLAG_REQUIRE_PACKET; - if (DetectBufferSetActiveList(de_ctx, s, g_ipv4hdr_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 32c7f3cc71..4eb2e9db6e 100644 --- a/src/detect-ipv6hdr.c +++ b/src/detect-ipv6hdr.c @@ -85,7 +85,7 @@ static int DetectIpv6hdrSetup (DetectEngineCtx *de_ctx, Signature *s, const char s->flags |= SIG_FLAG_REQUIRE_PACKET; - if (DetectBufferSetActiveList(de_ctx, s, g_ipv6hdr_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_ipv6hdr_buffer_id) < 0) return -1; return 0; diff --git a/src/detect-ja4-hash.c b/src/detect-ja4-hash.c index 5e08e7a093..8b090a7fba 100644 --- a/src/detect-ja4-hash.c +++ b/src/detect-ja4-hash.c @@ -115,7 +115,7 @@ void DetectJa4HashRegister(void) */ static int DetectJa4HashSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_ja4_hash_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_ja4_hash_buffer_id) < 0) return -1; AppProto alprotos[] = { ALPROTO_TLS, ALPROTO_QUIC, ALPROTO_UNKNOWN }; diff --git a/src/detect-krb5-cname.c b/src/detect-krb5-cname.c index 647bf9f1d8..d933fa1657 100644 --- a/src/detect-krb5-cname.c +++ b/src/detect-krb5-cname.c @@ -41,7 +41,7 @@ static int g_krb5_cname_buffer_id = 0; static int DetectKrb5CNameSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_krb5_cname_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 9510f493f8..e850fb90e6 100644 --- a/src/detect-krb5-sname.c +++ b/src/detect-krb5-sname.c @@ -41,7 +41,7 @@ static int g_krb5_sname_buffer_id = 0; static int DetectKrb5SNameSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_krb5_sname_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_krb5_sname_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_KRB5) != 0) diff --git a/src/detect-quic-cyu-hash.c b/src/detect-quic-cyu-hash.c index 86ec9559a7..b8ead1c1e0 100644 --- a/src/detect-quic-cyu-hash.c +++ b/src/detect-quic-cyu-hash.c @@ -47,7 +47,7 @@ static int g_buffer_id = 0; static int DetectQuicCyuHashSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 514abb9646..b18cce998d 100644 --- a/src/detect-quic-cyu-string.c +++ b/src/detect-quic-cyu-string.c @@ -45,7 +45,7 @@ static int g_buffer_id = 0; static int DetectQuicCyuStringSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 0623d0f59c..8a88c32b6b 100644 --- a/src/detect-quic-sni.c +++ b/src/detect-quic-sni.c @@ -101,7 +101,7 @@ void DetectQuicSniRegister(void) */ static int DetectQuicSniSetup(DetectEngineCtx *de_ctx, Signature *s, const char *rawstr) { - if (DetectBufferSetActiveList(de_ctx, s, quic_sni_id) < 0) + if (SCDetectBufferSetActiveList(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 a32a46cdfb..dc215f980c 100644 --- a/src/detect-quic-ua.c +++ b/src/detect-quic-ua.c @@ -101,7 +101,7 @@ void DetectQuicUaRegister(void) */ static int DetectQuicUaSetup(DetectEngineCtx *de_ctx, Signature *s, const char *rawstr) { - if (DetectBufferSetActiveList(de_ctx, s, quic_ua_id) < 0) + if (SCDetectBufferSetActiveList(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 f06a22dda3..395bbdb6e4 100644 --- a/src/detect-quic-version.c +++ b/src/detect-quic-version.c @@ -105,7 +105,7 @@ void DetectQuicVersionRegister(void) */ static int DetectQuicVersionSetup(DetectEngineCtx *de_ctx, Signature *s, const char *rawstr) { - if (DetectBufferSetActiveList(de_ctx, s, quic_version_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, quic_version_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_QUIC) < 0) diff --git a/src/detect-sip-method.c b/src/detect-sip-method.c index f99b303d9f..e9a5387b4e 100644 --- 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(de_ctx, s, g_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 cd0b00ae83..202b089372 100644 --- a/src/detect-sip-uri.c +++ b/src/detect-sip-uri.c @@ -69,7 +69,7 @@ static void DetectSipUriSetupCallback(const DetectEngineCtx *de_ctx, static int DetectSipUriSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 9a59d5bda9..a066c4e3f0 100644 --- a/src/detect-smb-ntlmssp.c +++ b/src/detect-smb-ntlmssp.c @@ -46,7 +46,7 @@ static int g_smb_nltmssp_user_buffer_id = 0; static int DetectSmbNtlmsspUserSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_smb_nltmssp_user_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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(de_ctx, s, g_smb_nltmssp_domain_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 d81b3473cc..924876cb6b 100644 --- a/src/detect-smb-share.c +++ b/src/detect-smb-share.c @@ -46,7 +46,7 @@ static int g_smb_named_pipe_buffer_id = 0; static int DetectSmbNamedPipeSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_smb_named_pipe_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_smb_named_pipe_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_SMB) < 0) @@ -106,7 +106,7 @@ static int g_smb_share_buffer_id = 0; static int DetectSmbShareSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_smb_share_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_smb_share_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_SMB) < 0) diff --git a/src/detect-smtp.c b/src/detect-smtp.c index 724b36d128..7dadf45ad8 100644 --- a/src/detect-smtp.c +++ b/src/detect-smtp.c @@ -38,7 +38,7 @@ static int g_smtp_rcpt_to_buffer_id = 0; static int DetectSmtpHeloSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_smtp_helo_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_smtp_helo_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_SMTP) < 0) @@ -66,7 +66,7 @@ static InspectionBuffer *GetSmtpHeloData(DetectEngineThreadCtx *det_ctx, static int DetectSmtpMailFromSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_smtp_mail_from_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_smtp_mail_from_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_SMTP) < 0) @@ -92,7 +92,7 @@ static InspectionBuffer *GetSmtpMailFromData(DetectEngineThreadCtx *det_ctx, static int DetectSmtpRcptToSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_smtp_rcpt_to_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_smtp_rcpt_to_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_SMTP) < 0) @@ -134,7 +134,7 @@ void SCDetectSMTPRegister(void) kw.name = "smtp.helo"; kw.desc = "SMTP helo buffer"; kw.url = "/rules/smtp-keywords.html#smtp-helo"; - kw.Setup = (int (*)(void *, void *, const char *))DetectSmtpHeloSetup; + kw.Setup = DetectSmtpHeloSetup; kw.flags = SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; DetectHelperKeywordRegister(&kw); g_smtp_helo_buffer_id = @@ -145,7 +145,7 @@ void SCDetectSMTPRegister(void) kw.name = "smtp.mail_from"; kw.desc = "SMTP mail from buffer"; kw.url = "/rules/smtp-keywords.html#smtp-mail-from"; - kw.Setup = (int (*)(void *, void *, const char *))DetectSmtpMailFromSetup; + kw.Setup = DetectSmtpMailFromSetup; kw.flags = SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; DetectHelperKeywordRegister(&kw); g_smtp_mail_from_buffer_id = @@ -156,7 +156,7 @@ void SCDetectSMTPRegister(void) kw.name = "smtp.rcpt_to"; kw.desc = "SMTP rcpt to buffer"; kw.url = "/rules/smtp-keywords.html#smtp-rcpt-to"; - kw.Setup = (int (*)(void *, void *, const char *))DetectSmtpRcptToSetup; + kw.Setup = DetectSmtpRcptToSetup; kw.flags = SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER; DetectHelperKeywordRegister(&kw); g_smtp_rcpt_to_buffer_id = DetectHelperMultiBufferMpmRegister( diff --git a/src/detect-ssh-hassh-server-string.c b/src/detect-ssh-hassh-server-string.c index b84687bfe3..98486b9519 100644 --- 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(de_ctx, s, g_ssh_hassh_server_string_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 719473ad29..1ba45fac55 100644 --- a/src/detect-ssh-hassh-server.c +++ b/src/detect-ssh-hassh-server.c @@ -98,7 +98,7 @@ static InspectionBuffer *GetSshData(DetectEngineThreadCtx *det_ctx, */ static int DetectSshHasshServerSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_ssh_hassh_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 c177e33180..21ffd90ce0 100644 --- 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(de_ctx, s, g_ssh_hassh_string_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 04b8f4b3c9..4516e1ced1 100644 --- 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(de_ctx, s, g_ssh_hassh_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 48b5b23b80..43247f8fed 100644 --- a/src/detect-ssh-proto.c +++ b/src/detect-ssh-proto.c @@ -84,7 +84,7 @@ static InspectionBuffer *GetSshData(DetectEngineThreadCtx *det_ctx, static int DetectSshProtocolSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 77d70af1a5..a3b53b0bf7 100644 --- a/src/detect-ssh-software.c +++ b/src/detect-ssh-software.c @@ -84,7 +84,7 @@ static InspectionBuffer *GetSshData(DetectEngineThreadCtx *det_ctx, static int DetectSshSoftwareSetup(DetectEngineCtx *de_ctx, Signature *s, const char *arg) { - if (DetectBufferSetActiveList(de_ctx, s, g_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 aba3f871ae..c35508e747 100644 --- a/src/detect-tcphdr.c +++ b/src/detect-tcphdr.c @@ -86,7 +86,7 @@ static int DetectTcphdrSetup (DetectEngineCtx *de_ctx, Signature *s, const char s->flags |= SIG_FLAG_REQUIRE_PACKET; - if (DetectBufferSetActiveList(de_ctx, s, g_tcphdr_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_tcphdr_buffer_id) < 0) return -1; return 0; diff --git a/src/detect-tls-alpn.c b/src/detect-tls-alpn.c index 8f7563cf4d..71d7538e7c 100644 --- a/src/detect-tls-alpn.c +++ b/src/detect-tls-alpn.c @@ -128,7 +128,7 @@ void DetectTlsAlpnRegister(void) */ static int DetectTlsAlpnSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_tls_alpn_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_tls_alpn_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_TLS) < 0) diff --git a/src/detect-tls-cert-fingerprint.c b/src/detect-tls-cert-fingerprint.c index c01887fade..d8350bf832 100644 --- 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(de_ctx, s, g_tls_cert_fingerprint_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 fd3d4aa924..e20a369874 100644 --- a/src/detect-tls-cert-issuer.c +++ b/src/detect-tls-cert-issuer.c @@ -111,7 +111,7 @@ void DetectTlsIssuerRegister(void) */ static int DetectTlsIssuerSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_tls_cert_issuer_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 1df78297b6..7d7628fd83 100644 --- a/src/detect-tls-cert-serial.c +++ b/src/detect-tls-cert-serial.c @@ -120,7 +120,7 @@ void DetectTlsSerialRegister(void) */ static int DetectTlsSerialSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_tls_cert_serial_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 96e50006d4..4cc3e17aeb 100644 --- a/src/detect-tls-cert-subject.c +++ b/src/detect-tls-cert-subject.c @@ -112,7 +112,7 @@ void DetectTlsSubjectRegister(void) */ static int DetectTlsSubjectSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_tls_cert_subject_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 aa8a86318f..cd29b7852a 100644 --- a/src/detect-tls-certs.c +++ b/src/detect-tls-certs.c @@ -138,7 +138,7 @@ void DetectTlsCertsRegister(void) static int DetectTlsCertsSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_tls_certs_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 2b412c3e96..1daf66a193 100644 --- a/src/detect-tls-ja3-hash.c +++ b/src/detect-tls-ja3-hash.c @@ -130,7 +130,7 @@ void DetectTlsJa3HashRegister(void) */ static int DetectTlsJa3HashSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_tls_ja3_hash_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_tls_ja3_hash_buffer_id) < 0) return -1; AppProto alprotos[] = { ALPROTO_TLS, ALPROTO_QUIC, ALPROTO_UNKNOWN }; diff --git a/src/detect-tls-ja3-string.c b/src/detect-tls-ja3-string.c index a831ad46bc..3a0400fb04 100644 --- a/src/detect-tls-ja3-string.c +++ b/src/detect-tls-ja3-string.c @@ -123,7 +123,7 @@ void DetectTlsJa3StringRegister(void) */ static int DetectTlsJa3StringSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_tls_ja3_str_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_tls_ja3_str_buffer_id) < 0) return -1; AppProto alprotos[] = { ALPROTO_TLS, ALPROTO_QUIC, ALPROTO_UNKNOWN }; diff --git a/src/detect-tls-ja3s-hash.c b/src/detect-tls-ja3s-hash.c index 48397b1cd3..ebfd7cb114 100644 --- a/src/detect-tls-ja3s-hash.c +++ b/src/detect-tls-ja3s-hash.c @@ -128,7 +128,7 @@ void DetectTlsJa3SHashRegister(void) */ static int DetectTlsJa3SHashSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_tls_ja3s_hash_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_tls_ja3s_hash_buffer_id) < 0) return -1; AppProto alprotos[] = { ALPROTO_TLS, ALPROTO_QUIC, ALPROTO_UNKNOWN }; diff --git a/src/detect-tls-ja3s-string.c b/src/detect-tls-ja3s-string.c index ba8f7bda18..fd1340a2f0 100644 --- a/src/detect-tls-ja3s-string.c +++ b/src/detect-tls-ja3s-string.c @@ -122,7 +122,7 @@ void DetectTlsJa3SStringRegister(void) */ static int DetectTlsJa3SStringSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_tls_ja3s_str_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_tls_ja3s_str_buffer_id) < 0) return -1; AppProto alprotos[] = { ALPROTO_TLS, ALPROTO_QUIC, ALPROTO_UNKNOWN }; diff --git a/src/detect-tls-random.c b/src/detect-tls-random.c index abc850cd0f..9655c0fbc7 100644 --- 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(de_ctx, s, g_tls_random_time_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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(de_ctx, s, g_tls_random_bytes_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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(de_ctx, s, g_tls_random_buffer_id) < 0) + if (SCDetectBufferSetActiveList(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 73cc630723..b7e58d7aa6 100644 --- a/src/detect-tls-sni.c +++ b/src/detect-tls-sni.c @@ -99,7 +99,7 @@ void DetectTlsSniRegister(void) */ static int DetectTlsSniSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_tls_sni_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_tls_sni_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_TLS) < 0) diff --git a/src/detect-tls-subjectaltname.c b/src/detect-tls-subjectaltname.c index 7bb601c850..7e535165c8 100644 --- a/src/detect-tls-subjectaltname.c +++ b/src/detect-tls-subjectaltname.c @@ -107,7 +107,7 @@ void DetectTlsSubjectAltNameRegister(void) */ static int DetectTlsSubjectAltNameSetup(DetectEngineCtx *de_ctx, Signature *s, const char *str) { - if (DetectBufferSetActiveList(de_ctx, s, g_tls_subjectaltname_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_tls_subjectaltname_buffer_id) < 0) return -1; if (DetectSignatureSetAppProto(s, ALPROTO_TLS) < 0) diff --git a/src/detect-udphdr.c b/src/detect-udphdr.c index 048e7abb18..d21565637a 100644 --- a/src/detect-udphdr.c +++ b/src/detect-udphdr.c @@ -85,7 +85,7 @@ static int DetectUdphdrSetup (DetectEngineCtx *de_ctx, Signature *s, const char s->flags |= SIG_FLAG_REQUIRE_PACKET; - if (DetectBufferSetActiveList(de_ctx, s, g_udphdr_buffer_id) < 0) + if (SCDetectBufferSetActiveList(de_ctx, s, g_udphdr_buffer_id) < 0) return -1; return 0;