Mqtt rust keywords 4863 v2

doc/userguide/rules/mqtt-keywords.rst

@@ -46,17 +46,22 @@ Valid values are :
 
 where ``UNASSIGNED`` refers to message type code 0.
 
+mqtt.type uses an :ref:`unsigned 8-bits integer <rules-integer-keywords>`.
+
 Examples::
 
   mqtt.type:CONNECT;
   mqtt.type:PUBLISH;
+  mqtt.type:2;
 
 
 mqtt.flags
 ----------
 
 Match on a combination of MQTT header flags, separated by commas (``,``). Flags may be prefixed by ``!`` to indicate negation, i.e. a flag prefixed by ``!`` must `not` be set to match.
 
+mqtt.flags uses an :ref:`unsigned 8-bits integer <rules-integer-keywords>`
+
 Valid flags are:
 
 * ``dup`` (duplicate message)
@@ -89,6 +94,8 @@ mqtt.reason_code
 
 Match on the numeric value of the reason code that is used in MQTT 5.0 for some message types. Please refer to the specification for the meaning of these values, which are often specific to the message type in question.
 
+mqtt.reason_code uses an :ref:`unsigned 8-bits integer <rules-integer-keywords>`.
+
 Examples::
 
   # match on attempts to unsubscribe from a non-subscribed topic
@@ -137,6 +144,8 @@ mqtt.connect.flags
 
 Match on a combination of MQTT CONNECT flags, separated by commas (``,``). Flags may be prefixed by ``!`` to indicate negation, i.e. a flag prefixed by ``!`` must `not` be set to match.
 
+mqtt.connect.flags uses an :ref:`unsigned 8-bits integer <rules-integer-keywords>`
+
 Valid flags are:
 
 * ``username`` (message contains a username)

rust/cbindgen.toml

@@ -109,6 +109,7 @@ exclude = [
     "IPPROTO_TCP",
     "IPPROTO_UDP",
     "SRepCatGetByShortname",
+    "SIG_FLAG_TOSERVER",
 ]
 
 # Types of items that we'll generate. If empty, then all types of item are emitted.

rust/derive/src/applayerevent.rs

@@ -110,6 +110,9 @@ pub fn derive_app_layer_event(input: TokenStream) -> TokenStream {
 
 /// Transform names such as "OneTwoThree" to "one_two_three".
 pub fn transform_name(in_name: &str) -> String {
+    if in_name.to_uppercase() == in_name {
+        return in_name.to_lowercase();
+    }
     let mut out = String::new();
     for (i, c) in in_name.chars().enumerate() {
         if i == 0 {
@@ -159,5 +162,7 @@ mod test {
             transform_name("UnassignedMsgType"),
             "unassigned_msg_type".to_string()
         );
+        assert_eq!(transform_name("SAMECASE"), "samecase".to_string());
+        assert_eq!(transform_name("ZFlagSet"), "z_flag_set".to_string());
     }
 }

rust/derive/src/stringenum.rs

@@ -27,13 +27,16 @@ pub fn derive_enum_string<T: std::str::FromStr + quote::ToTokens>(input: TokenSt
     let name = input.ident;
     let mut values = Vec::new();
     let mut names = Vec::new();
+    let mut names_upper = Vec::new();
     let mut fields = Vec::new();
 
     if let syn::Data::Enum(ref data) = input.data {
         for v in (&data.variants).into_iter() {
             if let Some((_, val)) = &v.discriminant {
                 let fname = transform_name(&v.ident.to_string());
+                let fnameu = fname.to_ascii_uppercase();
                 names.push(fname);
+                names_upper.push(fnameu);
                 fields.push(v.ident.clone());
                 if let syn::Expr::Lit(l) = val {
                     if let syn::Lit::Int(li) = &l.lit {
@@ -84,8 +87,8 @@ pub fn derive_enum_string<T: std::str::FromStr + quote::ToTokens>(input: TokenSt
                 }
             }
             fn from_str(s: &str) -> Option<Self> {
-                match s {
-                    #( #names => Some(#name::#fields) ,)*
+                match s.to_ascii_uppercase().as_str() {
+                    #( #names_upper => Some(#name::#fields) ,)*
                     _ => None
                 }
             }

rust/src/detect/mod.rs

@@ -29,7 +29,7 @@ pub mod requires;
 pub mod tojson;
 
 use crate::core::AppProto;
-use std::os::raw::{c_int, c_void};
+use std::os::raw::{c_char, c_int, c_void};
 
 /// EnumString trait that will be implemented on enums that
 /// derive StringEnum.
@@ -105,6 +105,44 @@ extern {
     ) -> *mut c_void;
 }
 
+// needed for calls to DetectAppLayerMultiRegister
+pub const SIG_FLAG_TOSERVER: u32 = 0x80000; // BIT_U32(19)
+
+extern {
+    // in detect-engine-helper.h
+    pub fn DetectHelperGetMultiData(
+        de: *mut c_void,
+        transforms: *const c_void,
+        flow: *const c_void,
+        flow_flags: u8,
+        tx: *const c_void,
+        list_id: c_int,
+        local_id: u32,
+        get_buf: unsafe extern "C" fn(*const c_void, u8, u32, *mut *const u8, *mut u32) -> bool,
+    ) -> *mut c_void;
+    // in detect-engine.h
+    pub fn DetectAppLayerMultiRegister(
+        name: *const c_char,
+        alproto: AppProto,
+        dir: u32,
+        progress: c_int,
+        get_data: unsafe extern "C" fn(
+            *mut c_void,
+            *const c_void,
+            *const c_void,
+            u8,
+            *const c_void,
+            i32,
+            u32,
+        ) -> *mut c_void,
+        priority: c_int,
+        tx_min_progress: c_int,
+    );
+    pub fn DetectBufferTypeSetDescriptionByName(name: *const c_char, desc: *const c_char);
+    pub fn DetectBufferTypeSupportsMultiInstance(name: *const c_char);
+    pub fn DetectBufferTypeGetByName(name: *const c_char) -> c_int;
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

rust/src/http2/detect.rs

@@ -359,7 +359,7 @@ pub unsafe extern "C" fn rs_http2_detect_sizeupdatectx_match(
 #[no_mangle]
 pub unsafe extern "C" fn rs_http2_tx_get_header_name(
     tx: &mut HTTP2Transaction, direction: u8, nb: u32, buffer: *mut *const u8, buffer_len: *mut u32,
-) -> u8 {
+) -> bool {
     let mut pos = 0_u32;
     match direction.into() {
         Direction::ToServer => {
@@ -369,7 +369,7 @@ pub unsafe extern "C" fn rs_http2_tx_get_header_name(
                         let value = &blocks[(nb - pos) as usize].name;
                         *buffer = value.as_ptr(); //unsafe
                         *buffer_len = value.len() as u32;
-                        return 1;
+                        return true;
                     } else {
                         pos += blocks.len() as u32;
                     }
@@ -383,15 +383,15 @@ pub unsafe extern "C" fn rs_http2_tx_get_header_name(
                         let value = &blocks[(nb - pos) as usize].name;
                         *buffer = value.as_ptr(); //unsafe
                         *buffer_len = value.len() as u32;
-                        return 1;
+                        return true;
                     } else {
                         pos += blocks.len() as u32;
                     }
                 }
             }
         }
     }
-    return 0;
+    return false;
 }
 
 fn http2_frames_get_header_firstvalue<'a>(