rust/files: open file without trackid as pointer

(cherry picked from commit cade6046c54e38715d73aad0ea21d780a81e626d)

diff --git a/rust/src/filecontainer.rs b/rust/src/filecontainer.rs
index 046dc7d05001a89ca6aace37c45803f313ea011d..3906ba8ccf91ce03da27df88bb014dca3196d143 100644 (file)
--- a/rust/src/filecontainer.rs
+++ b/rust/src/filecontainer.rs
@@ -47,13 +47,13 @@ impl FileContainer {
         }
     }
 
-    pub fn file_open(&mut self, cfg: &'static SuricataFileContext, track_id: &u32, name: &[u8], flags: u16) -> i32 {
+    pub fn file_open(&mut self, cfg: &'static SuricataFileContext, track_id: u32, name: &[u8], flags: u16) -> i32 {
         match unsafe {SC} {
             None => panic!("BUG no suricata_config"),
             Some(c) => {
                 SCLogDebug!("FILE {:p} OPEN flags {:04X}", &self, flags);
 
-                let res = (c.FileOpenFile)(&self, cfg.files_sbcfg, *track_id,
+                let res = (c.FileOpenFile)(&self, cfg.files_sbcfg, track_id,
                         name.as_ptr(), name.len() as u16,
                         ptr::null(), 0u32, flags);
                 res

diff --git a/rust/src/filetracker.rs b/rust/src/filetracker.rs
index 9310f16bba0f79cbd41224452e0943b7b8b70337..bc2ec20fb3ef64c559ede9f6d53d6c3a790d6d3d 100644 (file)
--- a/rust/src/filetracker.rs
+++ b/rust/src/filetracker.rs
@@ -95,7 +95,7 @@ impl FileTransferTracker {
     fn open(&mut self, config: &'static SuricataFileContext,
             files: &mut FileContainer, flags: u16, name: &[u8]) -> i32
     {
-        let r = files.file_open(config, &self.track_id, name, flags);
+        let r = files.file_open(config, self.track_id, name, flags);
         if r == 0 {
             files.file_set_txid_on_last_file(self.tx_id);
             self.file_open = true;