rust/default: Enable Default usage in SMB

diff --git a/rust/src/applayer.rs b/rust/src/applayer.rs
index 2660504c37cdefe030a0fa84cd7addd93d49760b..aa03c8a70ee80efb064f3ece079675b1c678e0fc 100644 (file)
--- a/rust/src/applayer.rs
+++ b/rust/src/applayer.rs
@@ -25,7 +25,7 @@ use std::os::raw::{c_void,c_char,c_int};
 use crate::core::SC;
 
 #[repr(C)]
-#[derive(Debug,PartialEq)]
+#[derive(Default, Debug,PartialEq)]
 pub struct AppLayerTxConfig {
     /// config: log flags
     log_flags: u8,
@@ -50,7 +50,7 @@ impl AppLayerTxConfig {
 }
 
 #[repr(C)]
-#[derive(Debug,PartialEq)]
+#[derive(Default, Debug,PartialEq)]
 pub struct AppLayerTxData {
     /// config: log flags
     pub config: AppLayerTxConfig,
@@ -355,7 +355,7 @@ impl AppLayerGetTxIterTuple {
 
 /// LoggerFlags tracks which loggers have already been executed.
 #[repr(C)]
-#[derive(Debug,PartialEq)]
+#[derive(Default, Debug,PartialEq)]
 pub struct LoggerFlags {
     flags: u32,
 }

diff --git a/rust/src/filetracker.rs b/rust/src/filetracker.rs
index 667f8c49318c2f46e02c79638d6620aee5bf15fa..2a9bbf0dada22381ba6e6b348066f555d1edbd84 100644 (file)
--- a/rust/src/filetracker.rs
+++ b/rust/src/filetracker.rs
@@ -49,6 +49,7 @@ impl FileChunk {
 }
 
 #[derive(Debug)]
+#[derive(Default)]
 pub struct FileTransferTracker {
     file_size: u64,
     pub tracked: u64,
@@ -71,19 +72,8 @@ pub struct FileTransferTracker {
 impl FileTransferTracker {
     pub fn new() -> FileTransferTracker {
         FileTransferTracker {
-            file_size:0,
-            tracked:0,
-            cur_ooo:0,
-            track_id:0,
-            chunk_left:0,
-            tx_id:0,
-            fill_bytes:0,
-            file_open:false,
-            chunk_is_last:false,
-            chunk_is_ooo:false,
-            file_is_truncated:false,
-            cur_ooo_chunk_offset:0,
             chunks:HashMap::new(),
+            ..Default::default()
         }
     }