app-layer: include DetectEngineState in AppLayerTxData

[people/ms/suricata.git] / rust / src / dcerpc / dcerpc.rs

diff --git a/rust/src/dcerpc/dcerpc.rs b/rust/src/dcerpc/dcerpc.rs
index 30d493562634403ecc0cdc29df8d3a9aa93fba6b..dae73128ff3edd6c288961a3f24541d956b73d94 100644 (file)
--- a/rust/src/dcerpc/dcerpc.rs
+++ b/rust/src/dcerpc/dcerpc.rs
@@ -183,7 +183,6 @@ pub struct DCERPCTransaction {
     pub activityuuid: Vec<u8>,
     pub seqnum: u32,
     pub tx_data: AppLayerTxData,
-    pub de_state: Option<*mut core::DetectEngineState>,
 }
 
 impl DCERPCTransaction {
@@ -195,20 +194,10 @@ impl DCERPCTransaction {
             resp_cmd: DCERPC_TYPE_RESPONSE,
             activityuuid: Vec::new(),
             tx_data: AppLayerTxData::new(),
-            de_state: None,
             ..Default::default()
         }
     }
 
-    pub fn free(&mut self) {
-        match self.de_state {
-            Some(state) => {
-                sc_detect_engine_state_free(state);
-            }
-            _ => {}
-        }
-    }
-
     pub fn get_req_ctxid(&self) -> u16 {
         self.ctxid
     }
@@ -226,12 +215,6 @@ impl DCERPCTransaction {
     }
 }
 
-impl Drop for DCERPCTransaction {
-    fn drop(&mut self) {
-        self.free();
-    }
-}
-
 #[derive(Debug)]
 pub struct DCERPCRequest {
     pub ctxid: u16,
@@ -1235,26 +1218,6 @@ pub unsafe extern "C" fn rs_dcerpc_state_trunc(state: *mut std::os::raw::c_void,
     }
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn rs_dcerpc_get_tx_detect_state(
-    vtx: *mut std::os::raw::c_void,
-) -> *mut core::DetectEngineState {
-    let dce_tx = cast_pointer!(vtx, DCERPCTransaction);
-    match dce_tx.de_state {
-        Some(ds) => ds,
-        None => std::ptr::null_mut(),
-    }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn rs_dcerpc_set_tx_detect_state(
-    vtx: *mut std::os::raw::c_void, de_state: &mut core::DetectEngineState,
-) -> std::os::raw::c_int {
-    let dce_tx = cast_pointer!(vtx, DCERPCTransaction);
-    dce_tx.de_state = Some(de_state);
-    0
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn rs_dcerpc_get_tx(
     vtx: *mut std::os::raw::c_void, tx_id: u64,
@@ -1397,8 +1360,6 @@ pub unsafe extern "C" fn rs_dcerpc_register_parser() {
         tx_comp_st_ts: 1,
         tx_comp_st_tc: 1,
         tx_get_progress: rs_dcerpc_get_alstate_progress,
-        get_de_state: rs_dcerpc_get_tx_detect_state,
-        set_de_state: rs_dcerpc_set_tx_detect_state,
         get_events: None,
         get_eventinfo: None,
         get_eventinfo_byid : None,