From acec24a8160a2ed8125781ede623fbf9ec70c58a Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Wed, 23 Nov 2022 11:56:33 +0100 Subject: [PATCH] rust/files: open file without trackid as pointer (cherry picked from commit cade6046c54e38715d73aad0ea21d780a81e626d) --- rust/src/filecontainer.rs | 4 ++-- rust/src/filetracker.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/src/filecontainer.rs b/rust/src/filecontainer.rs index 046dc7d050..3906ba8ccf 100644 --- 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 9310f16bba..bc2ec20fb3 100644 --- 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; -- 2.47.2