}
#[no_mangle]
-pub unsafe extern "C" fn rs_detect_u64_parse(
+pub unsafe extern "C" fn SCDetectU64Parse(
ustr: *const std::os::raw::c_char,
) -> *mut DetectUintData<u64> {
let ft_name: &CStr = CStr::from_ptr(ustr); //unsafe
}
#[no_mangle]
-pub unsafe extern "C" fn rs_detect_u64_match(
+pub unsafe extern "C" fn SCDetectU64Match(
arg: u64, ctx: &DetectUintData<u64>,
) -> std::os::raw::c_int {
if detect_match_uint(ctx, arg) {
}
#[no_mangle]
-pub unsafe extern "C" fn rs_detect_u64_free(ctx: &mut DetectUintData<u64>) {
+pub unsafe extern "C" fn SCDetectU64Free(ctx: &mut DetectUintData<u64>) {
// Just unbox...
std::mem::drop(Box::from_raw(ctx));
}
#[no_mangle]
-pub unsafe extern "C" fn rs_detect_u32_parse(
+pub unsafe extern "C" fn SCDetectU32Parse(
ustr: *const std::os::raw::c_char,
) -> *mut DetectUintData<u32> {
let ft_name: &CStr = CStr::from_ptr(ustr); //unsafe
}
#[no_mangle]
-pub unsafe extern "C" fn rs_detect_u32_parse_inclusive(
+pub unsafe extern "C" fn SCDetectU32ParseInclusive(
ustr: *const std::os::raw::c_char,
) -> *mut DetectUintData<u32> {
let ft_name: &CStr = CStr::from_ptr(ustr); //unsafe
}
#[no_mangle]
-pub unsafe extern "C" fn rs_detect_u32_match(
+pub unsafe extern "C" fn SCDetectU32Match(
arg: u32, ctx: &DetectUintData<u32>,
) -> std::os::raw::c_int {
if detect_match_uint(ctx, arg) {
}
#[no_mangle]
-pub unsafe extern "C" fn rs_detect_u32_free(ctx: &mut DetectUintData<u32>) {
+pub unsafe extern "C" fn SCDetectU32Free(ctx: &mut DetectUintData<u32>) {
// Just unbox...
std::mem::drop(Box::from_raw(ctx));
}
#[no_mangle]
-pub unsafe extern "C" fn rs_detect_u8_parse(
+pub unsafe extern "C" fn SCDetectU8Parse(
ustr: *const std::os::raw::c_char,
) -> *mut DetectUintData<u8> {
let ft_name: &CStr = CStr::from_ptr(ustr); //unsafe
}
#[no_mangle]
-pub unsafe extern "C" fn rs_detect_u8_match(
+pub unsafe extern "C" fn SCDetectU8Match(
arg: u8, ctx: &DetectUintData<u8>,
) -> std::os::raw::c_int {
if detect_match_uint(ctx, arg) {
}
#[no_mangle]
-pub unsafe extern "C" fn rs_detect_u8_free(ctx: &mut DetectUintData<u8>) {
+pub unsafe extern "C" fn SCDetectU8Free(ctx: &mut DetectUintData<u8>) {
// Just unbox...
std::mem::drop(Box::from_raw(ctx));
}
#[no_mangle]
-pub unsafe extern "C" fn rs_detect_u16_parse(
+pub unsafe extern "C" fn SCDetectU16Parse(
ustr: *const std::os::raw::c_char,
) -> *mut DetectUintData<u16> {
let ft_name: &CStr = CStr::from_ptr(ustr); //unsafe
}
#[no_mangle]
-pub unsafe extern "C" fn rs_detect_u16_match(
+pub unsafe extern "C" fn SCDetectU16Match(
arg: u16, ctx: &DetectUintData<u16>,
) -> std::os::raw::c_int {
if detect_match_uint(ctx, arg) {
}
#[no_mangle]
-pub unsafe extern "C" fn rs_detect_u16_free(ctx: &mut DetectUintData<u16>) {
+pub unsafe extern "C" fn SCDetectU16Free(ctx: &mut DetectUintData<u16>) {
// Just unbox...
std::mem::drop(Box::from_raw(ctx));
}
};
use super::parser::DHCPOptionWrapper;
use crate::detect::uint::{
- rs_detect_u64_free, rs_detect_u64_match, rs_detect_u64_parse, DetectUintData,
+ SCDetectU64Free, SCDetectU64Match, SCDetectU64Parse, DetectUintData,
};
use crate::detect::{
DetectHelperBufferRegister, DetectHelperKeywordRegister, DetectSignatureSetAppProto,
if DetectSignatureSetAppProto(s, ALPROTO_DHCP) != 0 {
return -1;
}
- let ctx = rs_detect_u64_parse(raw) as *mut c_void;
+ let ctx = SCDetectU64Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
let tx = cast_pointer!(tx, DHCPTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u64>);
if let Some(val) = dhcp_tx_get_time(tx, DHCP_OPT_ADDRESS_TIME) {
- return rs_detect_u64_match(val, ctx);
+ return SCDetectU64Match(val, ctx);
}
return 0;
}
unsafe extern "C" fn dhcp_detect_time_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u64>);
- rs_detect_u64_free(ctx);
+ SCDetectU64Free(ctx);
}
unsafe extern "C" fn dhcp_detect_rebindingtime_setup(
if DetectSignatureSetAppProto(s, ALPROTO_DHCP) != 0 {
return -1;
}
- let ctx = rs_detect_u64_parse(raw) as *mut c_void;
+ let ctx = SCDetectU64Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
let tx = cast_pointer!(tx, DHCPTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u64>);
if let Some(val) = dhcp_tx_get_time(tx, DHCP_OPT_REBINDING_TIME) {
- return rs_detect_u64_match(val, ctx);
+ return SCDetectU64Match(val, ctx);
}
return 0;
}
if DetectSignatureSetAppProto(s, ALPROTO_DHCP) != 0 {
return -1;
}
- let ctx = rs_detect_u64_parse(raw) as *mut c_void;
+ let ctx = SCDetectU64Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
let tx = cast_pointer!(tx, DHCPTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u64>);
if let Some(val) = dhcp_tx_get_time(tx, DHCP_OPT_RENEWAL_TIME) {
- return rs_detect_u64_match(val, ctx);
+ return SCDetectU64Match(val, ctx);
}
return 0;
}
};
use crate::detect::uint::{
- detect_match_uint, detect_parse_uint_enum, rs_detect_u16_free, rs_detect_u16_match,
- rs_detect_u16_parse, rs_detect_u32_free, rs_detect_u32_match, rs_detect_u32_parse,
- rs_detect_u8_free, rs_detect_u8_match, rs_detect_u8_parse, DetectUintData,
+ detect_match_uint, detect_parse_uint_enum, SCDetectU16Free, SCDetectU16Match,
+ SCDetectU16Parse, SCDetectU32Free, SCDetectU32Match, SCDetectU32Parse,
+ SCDetectU8Free, SCDetectU8Match, SCDetectU8Parse, DetectUintData,
};
use crate::detect::{
DetectBufferSetActiveList, DetectHelperBufferMpmRegister, DetectHelperBufferRegister,
if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 {
return -1;
}
- let ctx = rs_detect_u16_parse(raw) as *mut c_void;
+ let ctx = SCDetectU16Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
let tx = cast_pointer!(tx, EnipTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
if let Some(v) = tx_get_capabilities(tx) {
- return rs_detect_u16_match(v, ctx);
+ return SCDetectU16Match(v, ctx);
}
return 0;
}
unsafe extern "C" fn capabilities_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
- rs_detect_u16_free(ctx);
+ SCDetectU16Free(ctx);
}
unsafe extern "C" fn cip_attribute_setup(
if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 {
return -1;
}
- let ctx = rs_detect_u32_parse(raw) as *mut c_void;
+ let ctx = SCDetectU32Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
unsafe extern "C" fn cip_attribute_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
- rs_detect_u32_free(ctx);
+ SCDetectU32Free(ctx);
}
unsafe extern "C" fn cip_class_setup(
if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 {
return -1;
}
- let ctx = rs_detect_u32_parse(raw) as *mut c_void;
+ let ctx = SCDetectU32Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
unsafe extern "C" fn cip_class_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
- rs_detect_u32_free(ctx);
+ SCDetectU32Free(ctx);
}
unsafe extern "C" fn vendor_id_setup(
if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 {
return -1;
}
- let ctx = rs_detect_u16_parse(raw) as *mut c_void;
+ let ctx = SCDetectU16Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
let tx = cast_pointer!(tx, EnipTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
if let Some(val) = tx_get_vendor_id(tx) {
- return rs_detect_u16_match(val, ctx);
+ return SCDetectU16Match(val, ctx);
}
return 0;
}
unsafe extern "C" fn vendor_id_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
- rs_detect_u16_free(ctx);
+ SCDetectU16Free(ctx);
}
unsafe extern "C" fn status_setup(
let tx = cast_pointer!(tx, EnipTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
if let Some(x) = enip_get_status(tx, flags.into()) {
- return rs_detect_u32_match(x, ctx);
+ return SCDetectU32Match(x, ctx);
}
return 0;
}
unsafe extern "C" fn status_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
- rs_detect_u32_free(ctx);
+ SCDetectU32Free(ctx);
}
unsafe extern "C" fn state_setup(
if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 {
return -1;
}
- let ctx = rs_detect_u8_parse(raw) as *mut c_void;
+ let ctx = SCDetectU8Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
let tx = cast_pointer!(tx, EnipTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u8>);
if let Some(val) = tx_get_state(tx) {
- return rs_detect_u8_match(val, ctx);
+ return SCDetectU8Match(val, ctx);
}
return 0;
}
unsafe extern "C" fn state_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u8>);
- rs_detect_u8_free(ctx);
+ SCDetectU8Free(ctx);
}
unsafe extern "C" fn serial_setup(
if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 {
return -1;
}
- let ctx = rs_detect_u32_parse(raw) as *mut c_void;
+ let ctx = SCDetectU32Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
let tx = cast_pointer!(tx, EnipTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
if let Some(val) = tx_get_serial(tx) {
- return rs_detect_u32_match(val, ctx);
+ return SCDetectU32Match(val, ctx);
}
return 0;
}
unsafe extern "C" fn serial_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
- rs_detect_u32_free(ctx);
+ SCDetectU32Free(ctx);
}
unsafe extern "C" fn revision_setup(
if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 {
return -1;
}
- let ctx = rs_detect_u16_parse(raw) as *mut c_void;
+ let ctx = SCDetectU16Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
let tx = cast_pointer!(tx, EnipTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
if let Some(val) = tx_get_revision(tx) {
- return rs_detect_u16_match(val, ctx);
+ return SCDetectU16Match(val, ctx);
}
return 0;
}
unsafe extern "C" fn revision_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
- rs_detect_u16_free(ctx);
+ SCDetectU16Free(ctx);
}
unsafe extern "C" fn protocol_version_setup(
if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 {
return -1;
}
- let ctx = rs_detect_u16_parse(raw) as *mut c_void;
+ let ctx = SCDetectU16Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
let tx = cast_pointer!(tx, EnipTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
if let Some(val) = tx_get_protocol_version(tx, flags.into()) {
- return rs_detect_u16_match(val, ctx);
+ return SCDetectU16Match(val, ctx);
}
return 0;
}
unsafe extern "C" fn protocol_version_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
- rs_detect_u16_free(ctx);
+ SCDetectU16Free(ctx);
}
unsafe extern "C" fn product_code_setup(
if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 {
return -1;
}
- let ctx = rs_detect_u16_parse(raw) as *mut c_void;
+ let ctx = SCDetectU16Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
let tx = cast_pointer!(tx, EnipTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
if let Some(v) = tx_get_product_code(tx) {
- return rs_detect_u16_match(v, ctx);
+ return SCDetectU16Match(v, ctx);
}
return 0;
}
unsafe extern "C" fn product_code_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
- rs_detect_u16_free(ctx);
+ SCDetectU16Free(ctx);
}
unsafe extern "C" fn identity_status_setup(
if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 {
return -1;
}
- let ctx = rs_detect_u16_parse(raw) as *mut c_void;
+ let ctx = SCDetectU16Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
let tx = cast_pointer!(tx, EnipTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
if let Some(v) = tx_get_identity_status(tx) {
- return rs_detect_u16_match(v, ctx);
+ return SCDetectU16Match(v, ctx);
}
return 0;
}
unsafe extern "C" fn identity_status_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
- rs_detect_u16_free(ctx);
+ SCDetectU16Free(ctx);
}
unsafe extern "C" fn device_type_setup(
if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 {
return -1;
}
- let ctx = rs_detect_u16_parse(raw) as *mut c_void;
+ let ctx = SCDetectU16Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
let tx = cast_pointer!(tx, EnipTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
if let Some(v) = tx_get_device_type(tx) {
- return rs_detect_u16_match(v, ctx);
+ return SCDetectU16Match(v, ctx);
}
return 0;
}
unsafe extern "C" fn device_type_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
- rs_detect_u16_free(ctx);
+ SCDetectU16Free(ctx);
}
unsafe extern "C" fn command_setup(
let tx = cast_pointer!(tx, EnipTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
if let Some(v) = tx_get_command(tx, flags) {
- return rs_detect_u16_match(v, ctx);
+ return SCDetectU16Match(v, ctx);
}
return 0;
}
unsafe extern "C" fn command_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
- rs_detect_u16_free(ctx);
+ SCDetectU16Free(ctx);
}
unsafe extern "C" fn cip_status_setup(
if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 {
return -1;
}
- let ctx = rs_detect_u8_parse(raw) as *mut c_void;
+ let ctx = SCDetectU8Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
unsafe extern "C" fn cip_status_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u8>);
- rs_detect_u8_free(ctx);
+ SCDetectU8Free(ctx);
}
unsafe extern "C" fn cip_instance_setup(
if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 {
return -1;
}
- let ctx = rs_detect_u32_parse(raw) as *mut c_void;
+ let ctx = SCDetectU32Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
unsafe extern "C" fn cip_instance_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
- rs_detect_u32_free(ctx);
+ SCDetectU32Free(ctx);
}
unsafe extern "C" fn cip_extendedstatus_setup(
if DetectSignatureSetAppProto(s, ALPROTO_ENIP) != 0 {
return -1;
}
- let ctx = rs_detect_u16_parse(raw) as *mut c_void;
+ let ctx = SCDetectU16Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
unsafe extern "C" fn cip_extendedstatus_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u16>);
- rs_detect_u16_free(ctx);
+ SCDetectU16Free(ctx);
}
pub unsafe extern "C" fn product_name_setup(
use super::ldap::{LdapTransaction, ALPROTO_LDAP};
use crate::detect::uint::{
- detect_match_uint, detect_parse_uint_enum, rs_detect_u32_free, rs_detect_u32_parse,
- rs_detect_u8_free, DetectUintData,
+ detect_match_uint, detect_parse_uint_enum, SCDetectU32Free, SCDetectU32Parse,
+ SCDetectU8Free, DetectUintData,
};
use crate::detect::{
DetectBufferSetActiveList, DetectHelperBufferMpmRegister, DetectHelperBufferRegister,
unsafe extern "C" fn ldap_detect_request_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u8>);
- rs_detect_u8_free(ctx);
+ SCDetectU8Free(ctx);
}
fn parse_ldap_index(parts: &[&str]) -> Option<LdapIndex> {
if DetectSignatureSetAppProto(s, ALPROTO_LDAP) != 0 {
return -1;
}
- let ctx = rs_detect_u32_parse(raw) as *mut c_void;
+ let ctx = SCDetectU32Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
unsafe extern "C" fn ldap_detect_responses_count_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
- rs_detect_u32_free(ctx);
+ SCDetectU32Free(ctx);
}
unsafe extern "C" fn ldap_detect_request_dn_setup(
// written by Sascha Steinbiss <sascha@steinbiss.name>
use crate::detect::uint::{
- detect_match_uint, detect_parse_uint, detect_parse_uint_enum, rs_detect_u8_free,
- rs_detect_u8_parse, DetectUintData, DetectUintMode,
+ detect_match_uint, detect_parse_uint, detect_parse_uint_enum, SCDetectU8Free,
+ SCDetectU8Parse, DetectUintData, DetectUintMode,
};
use crate::detect::{
DetectBufferSetActiveList, DetectHelperBufferMpmRegister, DetectHelperBufferRegister,
unsafe extern "C" fn mqtt_type_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u8>);
- rs_detect_u8_free(ctx);
+ SCDetectU8Free(ctx);
}
unsafe extern "C" fn mqtt_reason_code_setup(
if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 {
return -1;
}
- let ctx = rs_detect_u8_parse(raw) as *mut c_void;
+ let ctx = SCDetectU8Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
unsafe extern "C" fn mqtt_reason_code_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u8>);
- rs_detect_u8_free(ctx);
+ SCDetectU8Free(ctx);
}
unsafe extern "C" fn mqtt_parse_qos(ustr: *const std::os::raw::c_char) -> *mut u8 {
if DetectSignatureSetAppProto(s, ALPROTO_MQTT) != 0 {
return -1;
}
- let ctx = rs_detect_u8_parse(raw) as *mut c_void;
+ let ctx = SCDetectU8Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
unsafe extern "C" fn mqtt_protocol_version_free(_de: *mut c_void, ctx: *mut c_void) {
let ctx = cast_pointer!(ctx, DetectUintData<u8>);
- rs_detect_u8_free(ctx);
+ SCDetectU8Free(ctx);
}
// maybe to factor with websocket.flags
unsafe extern "C" fn mqtt_flags_free(_de: *mut c_void, ctx: *mut c_void) {
let ctx = cast_pointer!(ctx, DetectUintData<u8>);
- rs_detect_u8_free(ctx);
+ SCDetectU8Free(ctx);
}
fn parse_conn_flag_list_item(s: &str) -> IResult<&str, MqttParsedFlagItem> {
unsafe extern "C" fn mqtt_conn_flags_free(_de: *mut c_void, ctx: *mut c_void) {
let ctx = cast_pointer!(ctx, DetectUintData<u8>);
- rs_detect_u8_free(ctx);
+ SCDetectU8Free(ctx);
}
unsafe extern "C" fn mqtt_conn_willtopic_setup(
use super::parser::RFBSecurityResultStatus;
use super::rfb::{RFBTransaction, ALPROTO_RFB};
use crate::detect::uint::{
- detect_match_uint, detect_parse_uint_enum, rs_detect_u32_free, rs_detect_u32_parse,
+ detect_match_uint, detect_parse_uint_enum, SCDetectU32Free, SCDetectU32Parse,
DetectUintData,
};
use crate::detect::{
if DetectSignatureSetAppProto(s, ALPROTO_RFB) != 0 {
return -1;
}
- let ctx = rs_detect_u32_parse(raw) as *mut c_void;
+ let ctx = SCDetectU32Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
unsafe extern "C" fn rfb_sec_type_free(_de: *mut c_void, ctx: *mut c_void) {
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
- rs_detect_u32_free(ctx);
+ SCDetectU32Free(ctx);
}
unsafe extern "C" fn rfb_parse_sec_result(
unsafe extern "C" fn rfb_sec_result_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
- rs_detect_u32_free(ctx);
+ SCDetectU32Free(ctx);
}
#[no_mangle]
use super::snmp::{SNMPTransaction, ALPROTO_SNMP};
use crate::detect::uint::{
- rs_detect_u32_free, rs_detect_u32_match, rs_detect_u32_parse, DetectUintData,
+ SCDetectU32Free, SCDetectU32Match, SCDetectU32Parse, DetectUintData,
};
use crate::detect::{
DetectBufferSetActiveList, DetectHelperBufferMpmRegister, DetectHelperBufferRegister,
if DetectSignatureSetAppProto(s, ALPROTO_SNMP) != 0 {
return -1;
}
- let ctx = rs_detect_u32_parse(raw) as *mut c_void;
+ let ctx = SCDetectU32Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
) -> c_int {
let tx = cast_pointer!(tx, SNMPTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
- return rs_detect_u32_match(tx.version, ctx);
+ return SCDetectU32Match(tx.version, ctx);
}
unsafe extern "C" fn snmp_detect_version_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
- rs_detect_u32_free(ctx);
+ SCDetectU32Free(ctx);
}
unsafe extern "C" fn snmp_detect_pdutype_setup(
if DetectSignatureSetAppProto(s, ALPROTO_SNMP) != 0 {
return -1;
}
- let ctx = rs_detect_u32_parse(raw) as *mut c_void;
+ let ctx = SCDetectU32Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
if let Some(ref info) = tx.info {
let pdu_type = info.pdu_type.0;
- return rs_detect_u32_match(pdu_type, ctx);
+ return SCDetectU32Match(pdu_type, ctx);
}
return 0;
}
unsafe extern "C" fn snmp_detect_pdutype_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
- rs_detect_u32_free(ctx);
+ SCDetectU32Free(ctx);
}
pub unsafe extern "C" fn snmp_detect_usm_setup(
use super::websocket::{WebSocketTransaction, ALPROTO_WEBSOCKET};
use crate::detect::uint::{
- detect_parse_uint, detect_parse_uint_enum, rs_detect_u32_free, rs_detect_u32_match,
- rs_detect_u32_parse, rs_detect_u8_free, rs_detect_u8_match, DetectUintData, DetectUintMode,
+ detect_parse_uint, detect_parse_uint_enum, SCDetectU32Free, SCDetectU32Match,
+ SCDetectU32Parse, SCDetectU8Free, SCDetectU8Match, DetectUintData, DetectUintMode,
};
use crate::detect::{
DetectBufferSetActiveList, DetectHelperBufferMpmRegister, DetectHelperBufferRegister,
) -> c_int {
let tx = cast_pointer!(tx, WebSocketTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u8>);
- return rs_detect_u8_match(tx.pdu.opcode, ctx);
+ return SCDetectU8Match(tx.pdu.opcode, ctx);
}
unsafe extern "C" fn websocket_detect_opcode_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u8>);
- rs_detect_u8_free(ctx);
+ SCDetectU8Free(ctx);
}
unsafe extern "C" fn websocket_detect_mask_setup(
if DetectSignatureSetAppProto(s, ALPROTO_WEBSOCKET) != 0 {
return -1;
}
- let ctx = rs_detect_u32_parse(raw) as *mut c_void;
+ let ctx = SCDetectU32Parse(raw) as *mut c_void;
if ctx.is_null() {
return -1;
}
let tx = cast_pointer!(tx, WebSocketTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
if let Some(xorkey) = tx.pdu.mask {
- return rs_detect_u32_match(xorkey, ctx);
+ return SCDetectU32Match(xorkey, ctx);
}
return 0;
}
unsafe extern "C" fn websocket_detect_mask_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u32>);
- rs_detect_u32_free(ctx);
+ SCDetectU32Free(ctx);
}
unsafe extern "C" fn websocket_detect_flags_setup(
) -> c_int {
let tx = cast_pointer!(tx, WebSocketTransaction);
let ctx = cast_pointer!(ctx, DetectUintData<u8>);
- return rs_detect_u8_match(tx.pdu.flags, ctx);
+ return SCDetectU8Match(tx.pdu.flags, ctx);
}
unsafe extern "C" fn websocket_detect_flags_free(_de: *mut c_void, ctx: *mut c_void) {
// Just unbox...
let ctx = cast_pointer!(ctx, DetectUintData<u8>);
- rs_detect_u8_free(ctx);
+ SCDetectU8Free(ctx);
}
pub unsafe extern "C" fn websocket_detect_payload_setup(
return;
DetectU64Data *bsz = (DetectU64Data *)ptr;
- rs_detect_u64_free(bsz);
+ SCDetectU64Free(bsz);
}
#ifdef UNITTESTS
{
SCEnter();
if (ptr != NULL) {
- rs_detect_u8_free(ptr);
+ SCDetectU8Free(ptr);
}
SCReturn;
}
{
SCEnter();
if (ptr != NULL) {
- rs_detect_u8_free(ptr);
+ SCDetectU8Free(ptr);
}
SCReturn;
}
{
SCEnter();
if (ptr != NULL) {
- rs_detect_u16_free(ptr);
+ SCDetectU16Free(ptr);
}
SCReturn;
}
SigMatch *sm = SigMatchAppendSMToList(
de_ctx, s, DETECT_DSIZE, (SigMatchCtx *)dd, DETECT_SM_LIST_MATCH);
if (sm == NULL) {
- rs_detect_u16_free(dd);
+ SCDetectU16Free(dd);
return -1;
}
*/
void DetectDsizeFree(DetectEngineCtx *de_ctx, void *de_ptr)
{
- rs_detect_u16_free(de_ptr);
+ SCDetectU16Free(de_ptr);
}
/* prefilter code */
int DetectU32Match(const uint32_t parg, const DetectUintData_u32 *du32)
{
- return rs_detect_u32_match(parg, du32);
+ return SCDetectU32Match(parg, du32);
}
/**
DetectUintData_u32 *DetectU32Parse(const char *u32str)
{
- return rs_detect_u32_parse(u32str);
+ return SCDetectU32Parse(u32str);
}
void
//same as u32 but with u8
int DetectU8Match(const uint8_t parg, const DetectUintData_u8 *du8)
{
- return rs_detect_u8_match(parg, du8);
+ return SCDetectU8Match(parg, du8);
}
/**
DetectUintData_u8 *DetectU8Parse(const char *u8str)
{
- return rs_detect_u8_parse(u8str);
+ return SCDetectU8Parse(u8str);
}
void PrefilterPacketU8Set(PrefilterPacketHeaderValue *v, void *smctx)
// same as u32 but with u16
int DetectU16Match(const uint16_t parg, const DetectUintData_u16 *du16)
{
- return rs_detect_u16_match(parg, du16);
+ return SCDetectU16Match(parg, du16);
}
/**
DetectUintData_u16 *DetectU16Parse(const char *u16str)
{
- return rs_detect_u16_parse(u16str);
+ return SCDetectU16Parse(u16str);
}
void PrefilterPacketU16Set(PrefilterPacketHeaderValue *v, void *smctx)
int DetectU64Match(const uint64_t parg, const DetectUintData_u64 *du64)
{
- return rs_detect_u64_match(parg, du64);
+ return SCDetectU64Match(parg, du64);
}
DetectUintData_u64 *DetectU64Parse(const char *u64str)
{
- return rs_detect_u64_parse(u64str);
+ return SCDetectU64Parse(u64str);
}
*/
static void DetectFilesizeFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u64_free(ptr);
+ SCDetectU64Free(ptr);
}
#ifdef UNITTESTS
static void DetectFlowAgeFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u32_free(ptr);
+ SCDetectU32Free(ptr);
}
static int DetectFlowAgeSetup(DetectEngineCtx *de_ctx, Signature *s, const char *rawstr)
if (SigMatchAppendSMToList(de_ctx, s, DETECT_HTTP2_PRIORITY, (SigMatchCtx *)prio,
g_http2_match_buffer_id) == NULL) {
- rs_detect_u8_free(prio);
+ SCDetectU8Free(prio);
return -1;
}
*/
void DetectHTTP2priorityFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u8_free(ptr);
+ SCDetectU8Free(ptr);
}
/**
if (SigMatchAppendSMToList(de_ctx, s, DETECT_HTTP2_WINDOW, (SigMatchCtx *)wu,
g_http2_match_buffer_id) == NULL) {
- rs_detect_u32_free(wu);
+ SCDetectU32Free(wu);
return -1;
}
*/
void DetectHTTP2windowFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u32_free(ptr);
+ SCDetectU32Free(ptr);
}
/**
if (DetectSignatureSetAppProto(s, ALPROTO_HTTP2) != 0)
return -1;
- void *su = rs_detect_u64_parse(str);
+ void *su = SCDetectU64Parse(str);
if (su == NULL)
return -1;
*/
void DetectHTTP2sizeUpdateFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u64_free(ptr);
+ SCDetectU64Free(ptr);
}
/**
*/
void DetectICMPv6mtuFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u32_free(ptr);
+ SCDetectU32Free(ptr);
}
/* prefilter code */
if (SigMatchAppendSMToList(de_ctx, s, DETECT_ICODE, (SigMatchCtx *)icd, DETECT_SM_LIST_MATCH) ==
NULL) {
- rs_detect_u8_free(icd);
+ SCDetectU8Free(icd);
return -1;
}
s->flags |= SIG_FLAG_REQUIRE_PACKET;
*/
void DetectICodeFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u8_free(ptr);
+ SCDetectU8Free(ptr);
}
/* prefilter code */
*/
static void DetectIkeExchTypeFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u8_free(ptr);
+ SCDetectU8Free(ptr);
}
*/
static void DetectIkeKeyExchangePayloadLengthFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u32_free(ptr);
+ SCDetectU32Free(ptr);
}
*/
static void DetectIkeNoncePayloadLengthFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u32_free(ptr);
+ SCDetectU32Free(ptr);
}
void DetectITypeFree(DetectEngineCtx *de_ctx, void *ptr)
{
DetectU8Data *itd = (DetectU8Data *)ptr;
- rs_detect_u8_free(itd);
+ SCDetectU8Free(itd);
}
/* prefilter code
*/
static DetectU32Data *DetectNfsProcedureParse(const char *rawstr)
{
- return rs_detect_u32_parse_inclusive(rawstr);
+ return SCDetectU32ParseInclusive(rawstr);
}
*/
void DetectNfsProcedureFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u32_free(ptr);
+ SCDetectU32Free(ptr);
}
#ifdef UNITTESTS
*/
static DetectU32Data *DetectNfsVersionParse(const char *rawstr)
{
- return rs_detect_u32_parse_inclusive(rawstr);
+ return SCDetectU32ParseInclusive(rawstr);
}
*/
void DetectNfsVersionFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u32_free(ptr);
+ SCDetectU32Free(ptr);
}
*/
void DetectTcpmssFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u16_free(ptr);
+ SCDetectU16Free(ptr);
}
/* prefilter code */
*/
void DetectTemplate2Free(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u8_free(ptr);
+ SCDetectU8Free(ptr);
}
/* prefilter code */
*/
static void DetectTLSCertChainLenFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u32_free(ptr);
+ SCDetectU32Free(ptr);
}
/**
if (SigMatchAppendSMToList(de_ctx, s, KEYWORD_ID, (SigMatchCtx *)dd, g_tls_cert_buffer_id) ==
NULL) {
- rs_detect_u32_free(dd);
+ SCDetectU32Free(dd);
return -1;
}
return 0;
*/
void DetectTtlFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u8_free(ptr);
+ SCDetectU8Free(ptr);
}
/* prefilter code */
static void DetectVlanLayersFree(DetectEngineCtx *de_ctx, void *ptr)
{
- rs_detect_u8_free(ptr);
+ SCDetectU8Free(ptr);
}
static int DetectVlanLayersSetup(DetectEngineCtx *de_ctx, Signature *s, const char *rawstr)