rust/files: open file without trackid as pointer

diff --git a/rust/src/filecontainer.rs b/rust/src/filecontainer.rs
index 8b89d2bab0abe6f518a1554f1af29ff42e92ba83..195c1035e3955a54c84974670e0ad95bf60d9331 100644 (file)
--- a/rust/src/filecontainer.rs
+++ b/rust/src/filecontainer.rs
@@ -75,13 +75,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 7ddcda832219bf9a2a23858373fbdd78847bcc84..ee4c6a71fbb8694716b5539629023c2c8560e553 100644 (file)
--- a/rust/src/filetracker.rs
+++ b/rust/src/filetracker.rs
@@ -85,7 +85,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 {
             self.file_open = true;
         }