rust/files: open file without trackid as pointer

pull/8209/head
Victor Julien 4 years ago
parent ad869e1c52
commit cade6046c5

@ -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} { match unsafe {SC} {
None => panic!("BUG no suricata_config"), None => panic!("BUG no suricata_config"),
Some(c) => { Some(c) => {
SCLogDebug!("FILE {:p} OPEN flags {:04X}", &self, flags); 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, name.as_ptr(), name.len() as u16,
ptr::null(), 0u32, flags); ptr::null(), 0u32, flags);
res res

@ -85,7 +85,7 @@ impl FileTransferTracker {
fn open(&mut self, config: &'static SuricataFileContext, fn open(&mut self, config: &'static SuricataFileContext,
files: &mut FileContainer, flags: u16, name: &[u8]) -> i32 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 { if r == 0 {
self.file_open = true; self.file_open = true;
} }

Loading…
Cancel
Save