filetracker: track total queued data (in_flight)

As well as expose number of chunks.

(cherry picked from commit 2c5ad8858e38fce20155044a06969693fe472d4c)

diff --git a/rust/src/filetracker.rs b/rust/src/filetracker.rs
index 5b233cd509d39591c48e258daf42c2dad1db6e2b..9310f16bba0f79cbd41224452e0943b7b8b70337 100644 (file)
--- a/rust/src/filetracker.rs
+++ b/rust/src/filetracker.rs
@@ -65,6 +65,8 @@ pub struct FileTransferTracker {
 
     chunks: HashMap<u64, FileChunk>,
     cur_ooo_chunk_offset: u64,
+
+    in_flight: u64,
 }
 
 impl FileTransferTracker {
@@ -82,6 +84,7 @@ impl FileTransferTracker {
             file_is_truncated:false,
             cur_ooo_chunk_offset:0,
             chunks:HashMap::new(),
+            in_flight: 0,
         }
     }
 
@@ -233,6 +236,9 @@ impl FileTransferTracker {
                     self.cur_ooo += d.len() as u64;
                     c.contains_gap |= is_gap;
                     c.chunk.extend(d);
+
+                    self.in_flight += d.len() as u64;
+                    SCLogDebug!("{:p} in_flight {}", self, self.in_flight);
                 }
 
                 consumed += self.chunk_left as usize;
@@ -256,6 +262,8 @@ impl FileTransferTracker {
                             let _offset = self.tracked;
                             match self.chunks.remove(&self.tracked) {
                                 Some(c) => {
+                                    self.in_flight -= c.chunk.len() as u64;
+
                                     let res = files.file_append(&self.track_id, &c.chunk, c.contains_gap);
                                     match res {
                                         0   => { },
@@ -316,6 +324,7 @@ impl FileTransferTracker {
                     c.chunk.extend(data);
                     c.contains_gap |= is_gap;
                     self.cur_ooo += data.len() as u64;
+                    self.in_flight += data.len() as u64;
                 }
 
                 self.chunk_left -= data.len() as u32;
@@ -328,4 +337,11 @@ impl FileTransferTracker {
     pub fn get_queued_size(&self) -> u64 {
         self.cur_ooo
     }
+
+    pub fn get_inflight_size(&self) -> u64 {
+        self.in_flight
+    }
+    pub fn get_inflight_cnt(&self) -> usize {
+        self.chunks.len()
+    }
 }