smb: clean up partial read/write record handling

diff --git a/rust/src/smb/smb.rs b/rust/src/smb/smb.rs
index 60f1507d299a421ace4ce510494dc7fe734bcccf..29db1d3fc45d2d4803b57e12d4e472fc903e08cf 100644 (file)
--- a/rust/src/smb/smb.rs
+++ b/rust/src/smb/smb.rs
@@ -1107,6 +1107,18 @@ impl SMBState {
         }
     }
 
+    pub fn set_file_left(&mut self, direction: u8, rec_size: u32, data_size: u32, fuid: Vec<u8>)
+    {
+        let left = if data_size >= rec_size { 0 } else { rec_size - data_size };
+        if direction == STREAM_TOSERVER {
+            self.file_ts_left = left;
+            self.file_ts_guid = fuid;
+        } else {
+            self.file_tc_left = left;
+            self.file_tc_guid = fuid;
+        }
+    }
+
     pub fn set_skip(&mut self, direction: u8, rec_size: u32, data_size: u32)
     {
         let skip = if data_size >= rec_size { 0 } else { rec_size - data_size };

diff --git a/rust/src/smb/smb1.rs b/rust/src/smb/smb1.rs
index ebaa0314bcae5f75428b2a897c208f092f048ddd..a45508b8c8f1f3fe11813fb72517352d9de5d79c 100644 (file)
--- a/rust/src/smb/smb1.rs
+++ b/rust/src/smb/smb1.rs
@@ -856,9 +856,8 @@ pub fn smb1_write_request_record<'b>(state: &mut SMBState, r: &SmbRecord<'b>)
                     tx.vercmd.set_smb1_cmd(SMB1_COMMAND_WRITE_ANDX);
                 }
             }
-            state.file_ts_left = rd.len - rd.data.len() as u32;
-            state.file_ts_guid = file_fid.to_vec();
-            SCLogDebug!("SMBv1 WRITE RESPONSE: {} bytes left", state.file_tc_left);
+
+            state.set_file_left(STREAM_TOSERVER, rd.len, rd.data.len() as u32, file_fid.to_vec());
 
             if r.command == SMB1_COMMAND_WRITE_AND_CLOSE {
                 SCLogDebug!("closing FID {:?}", file_fid);
@@ -939,9 +938,7 @@ pub fn smb1_read_response_record<'b>(state: &mut SMBState, r: &SmbRecord<'b>)
                     smb_read_dcerpc_record(state, vercmd, hdr, &pure_fid, &rd.data);
                 }
 
-                state.file_tc_left = rd.len - rd.data.len() as u32;
-                state.file_tc_guid = file_fid.to_vec();
-                SCLogDebug!("SMBv1 READ RESPONSE: {} bytes left", state.file_tc_left);
+                state.set_file_left(STREAM_TOCLIENT, rd.len, rd.data.len() as u32, file_fid.to_vec());
             }
             _ => {
                 events.push(SMBEvent::MalformedData);

diff --git a/rust/src/smb/smb2.rs b/rust/src/smb/smb2.rs
index 0da71ab617011f6971a1867657c257bef1aaf73a..fd843c88cfd4ed6adea39a82564b8c88a406826f 100644 (file)
--- a/rust/src/smb/smb2.rs
+++ b/rust/src/smb/smb2.rs
@@ -186,9 +186,7 @@ pub fn smb2_read_response_record<'b>(state: &mut SMBState, r: &Smb2Record<'b>)
                 }
             }
 
-            state.file_tc_left = rd.len - rd.data.len() as u32;
-            state.file_tc_guid = file_guid.to_vec();
-            SCLogDebug!("SMBv2 READ RESPONSE: {} bytes left", state.file_tc_left);
+            state.set_file_left(STREAM_TOCLIENT, rd.len, rd.data.len() as u32, file_guid.to_vec());
         }
         _ => {
             state.set_event(SMBEvent::MalformedData);
@@ -257,10 +255,7 @@ pub fn smb2_write_request_record<'b>(state: &mut SMBState, r: &Smb2Record<'b>)
                             r.session_id, r.tree_id, 0); // TODO move into new_file_tx
                 }
             }
-            state.file_ts_left = wr.wr_len - wr.data.len() as u32;
-            state.file_ts_guid = file_guid.to_vec();
-            SCLogDebug!("SMBv2 WRITE REQUEST: {} bytes left", state.file_ts_left);
-
+            state.set_file_left(STREAM_TOSERVER, wr.wr_len, wr.data.len() as u32, file_guid.to_vec());
         },
         _ => {
             state.set_event(SMBEvent::MalformedData);