aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

smb: minor function cleanup

Browse Source 
Remove used argument from `filetracker_newchunk()`. We're not
using fill_bytes with smb.
pull/7262/head
Victor Julien 4 years ago
parent c7a474c725
commit 594acec5dc
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

4
rust/src/smb/files.rs
Unescape Escape View File

@ -47,12 +47,12 @@ impl SMBTransactionFile {
/// little wrapper around the FileTransferTracker::new_chunk method /// little wrapper around the FileTransferTracker::new_chunk method
pub fn filetracker_newchunk(ft: &mut FileTransferTracker, files: &mut FileContainer, pub fn filetracker_newchunk(ft: &mut FileTransferTracker, files: &mut FileContainer,
flags: u16, name: &Vec<u8>, data: &[u8], flags: u16, name: &Vec<u8>, data: &[u8],
chunk_offset: u64, chunk_size: u32, fill_bytes: u8, is_last: bool, xid: &u32) chunk_offset: u64, chunk_size: u32, is_last: bool, xid: &u32)
{ {
match unsafe {SURICATA_SMB_FILE_CONFIG} { match unsafe {SURICATA_SMB_FILE_CONFIG} {
Some(sfcm) => { Some(sfcm) => {
ft.new_chunk(sfcm, files, flags, name, data, chunk_offset, ft.new_chunk(sfcm, files, flags, name, data, chunk_offset,
chunk_size, fill_bytes, is_last, xid); } chunk_size, 0, is_last, xid); }
None => panic!("no SURICATA_SMB_FILE_CONFIG"), None => panic!("no SURICATA_SMB_FILE_CONFIG"),
} }
} }

8
rust/src/smb/smb1.rs
Unescape Escape View File

@ -969,7 +969,7 @@ pub fn smb1_write_request_record<'b>(state: &mut SMBState, r: &SmbRecord<'b>, an
} }
filetracker_newchunk(&mut tdf.file_tracker, files, flags, filetracker_newchunk(&mut tdf.file_tracker, files, flags,
&file_name, rd.data, rd.offset, &file_name, rd.data, rd.offset,
rd.len, 0, false, &file_id); rd.len, false, &file_id);
SCLogDebug!("FID {:?} found at tx {}", file_fid, tx.id); SCLogDebug!("FID {:?} found at tx {}", file_fid, tx.id);
} }
true true
@ -997,7 +997,7 @@ pub fn smb1_write_request_record<'b>(state: &mut SMBState, r: &SmbRecord<'b>, an
} }
filetracker_newchunk(&mut tdf.file_tracker, files, flags, filetracker_newchunk(&mut tdf.file_tracker, files, flags,
&file_name, rd.data, rd.offset, &file_name, rd.data, rd.offset,
rd.len, 0, false, &file_id); rd.len, false, &file_id);
tdf.share_name = share_name; tdf.share_name = share_name;
} }
tx.vercmd.set_smb1_cmd(SMB1_COMMAND_WRITE_ANDX); tx.vercmd.set_smb1_cmd(SMB1_COMMAND_WRITE_ANDX);
@ -1063,7 +1063,7 @@ pub fn smb1_read_response_record<'b>(state: &mut SMBState, r: &SmbRecord<'b>, an
} }
filetracker_newchunk(&mut tdf.file_tracker, files, flags, filetracker_newchunk(&mut tdf.file_tracker, files, flags,
&file_name, rd.data, offset, &file_name, rd.data, offset,
rd.len, 0, false, &file_id); rd.len, false, &file_id);
} }
true true
}, },
@ -1079,7 +1079,7 @@ pub fn smb1_read_response_record<'b>(state: &mut SMBState, r: &SmbRecord<'b>, an
} }
filetracker_newchunk(&mut tdf.file_tracker, files, flags, filetracker_newchunk(&mut tdf.file_tracker, files, flags,
&file_name, rd.data, offset, &file_name, rd.data, offset,
rd.len, 0, false, &file_id); rd.len, false, &file_id);
tdf.share_name = share_name; tdf.share_name = share_name;
} }
tx.vercmd.set_smb1_cmd(SMB1_COMMAND_READ_ANDX); tx.vercmd.set_smb1_cmd(SMB1_COMMAND_READ_ANDX);

8
rust/src/smb/smb2.rs
Unescape Escape View File

@ -154,7 +154,7 @@ pub fn smb2_read_response_record<'b>(state: &mut SMBState, r: &Smb2Record<'b>)
} }
filetracker_newchunk(&mut tdf.file_tracker, files, flags, filetracker_newchunk(&mut tdf.file_tracker, files, flags,
&tdf.file_name, rd.data, offset, &tdf.file_name, rd.data, offset,
rd.len, 0, false, &file_id); rd.len, false, &file_id);
} }
true true
}, },
@ -214,7 +214,7 @@ pub fn smb2_read_response_record<'b>(state: &mut SMBState, r: &Smb2Record<'b>)
} }
filetracker_newchunk(&mut tdf.file_tracker, files, flags, filetracker_newchunk(&mut tdf.file_tracker, files, flags,
&file_name, rd.data, offset, &file_name, rd.data, offset,
rd.len, 0, false, &file_id); rd.len, false, &file_id);
tdf.share_name = share_name; tdf.share_name = share_name;
} }
tx.vercmd.set_smb2_cmd(SMB2_COMMAND_READ); tx.vercmd.set_smb2_cmd(SMB2_COMMAND_READ);
@ -265,7 +265,7 @@ pub fn smb2_write_request_record<'b>(state: &mut SMBState, r: &Smb2Record<'b>)
} }
filetracker_newchunk(&mut tdf.file_tracker, files, flags, filetracker_newchunk(&mut tdf.file_tracker, files, flags,
&file_name, wr.data, wr.wr_offset, &file_name, wr.data, wr.wr_offset,
wr.wr_len, 0, false, &file_id); wr.wr_len, false, &file_id);
} }
true true
}, },
@ -321,7 +321,7 @@ pub fn smb2_write_request_record<'b>(state: &mut SMBState, r: &Smb2Record<'b>)
} }
filetracker_newchunk(&mut tdf.file_tracker, files, flags, filetracker_newchunk(&mut tdf.file_tracker, files, flags,
&file_name, wr.data, wr.wr_offset, &file_name, wr.data, wr.wr_offset,
wr.wr_len, 0, false, &file_id); wr.wr_len, false, &file_id);
} }
tx.vercmd.set_smb2_cmd(SMB2_COMMAND_WRITE); tx.vercmd.set_smb2_cmd(SMB2_COMMAND_WRITE);
tx.hdr = SMBCommonHdr::new(SMBHDR_TYPE_HEADER, tx.hdr = SMBCommonHdr::new(SMBHDR_TYPE_HEADER,

Write Preview
Loading…
Cancel
Save