simplify InfoTraffic struct: use DataInfo

GyulyVGC · GyulyVGC · commit bc6c5076395a · 2025-06-22T00:13:50.000+02:00
diff --git a/src/chart/manage_chart_data.rs b/src/chart/manage_chart_data.rs
@@ -16,16 +16,20 @@ impl TrafficChart {
         self.ticks += 1;
 
         #[allow(clippy::cast_precision_loss)]
-        let out_bytes_entry =
-            -1.0 * (info_traffic.tot_out_bytes - info_traffic.tot_out_bytes_prev) as f32;
+        let out_bytes_entry = -1.0
+            * (info_traffic.tot_data_info.outgoing_bytes()
+                - info_traffic.tot_data_info_prev.outgoing_bytes()) as f32;
         #[allow(clippy::cast_precision_loss)]
-        let in_bytes_entry = (info_traffic.tot_in_bytes - info_traffic.tot_in_bytes_prev) as f32;
+        let in_bytes_entry = (info_traffic.tot_data_info.incoming_bytes()
+            - info_traffic.tot_data_info_prev.incoming_bytes()) as f32;
         #[allow(clippy::cast_precision_loss)]
-        let out_packets_entry =
-            -1.0 * (info_traffic.tot_out_packets - info_traffic.tot_out_packets_prev) as f32;
+        let out_packets_entry = -1.0
+            * (info_traffic.tot_data_info.outgoing_packets()
+                - info_traffic.tot_data_info_prev.outgoing_packets()) as f32;
         #[allow(clippy::cast_precision_loss)]
-        let in_packets_entry =
-            (info_traffic.tot_in_packets - info_traffic.tot_in_packets_prev) as f32;
+        let in_packets_entry = (info_traffic.tot_data_info.incoming_packets()
+            - info_traffic.tot_data_info_prev.incoming_packets())
+            as f32;
 
         let out_bytes_point = (tot_seconds, out_bytes_entry);
         let in_bytes_point = (tot_seconds, in_bytes_entry);
@@ -163,6 +167,8 @@ mod tests {
     use splines::{Interpolation, Key, Spline};
 
     use crate::chart::manage_chart_data::{ChartSeries, get_max, get_min};
+    use crate::networking::types::data_info::DataInfo;
+    use crate::networking::types::traffic_direction::TrafficDirection;
     use crate::utils::types::timestamp::Timestamp;
     use crate::{ChartType, InfoTraffic, Language, StyleType, TrafficChart};
 
@@ -250,6 +256,14 @@ mod tests {
         };
         let tot_sent = 1000 * 28 + 500;
         let tot_received = 21000 * 28 + 1000;
+        let tot_data_info_prev =
+            DataInfo::new_for_tests(tot_received, tot_sent, tot_received, tot_sent);
+        let tot_data_info = DataInfo::new_for_tests(
+            tot_received + 4444,
+            tot_sent + 3333,
+            tot_received + 2222,
+            tot_sent + 1111,
+        );
         let mut traffic_chart = TrafficChart {
             ticks: 29,
             out_bytes: sent.clone(),
@@ -271,15 +285,9 @@ mod tests {
         let mut info_traffic = InfoTraffic {
             all_bytes: 0,
             all_packets: 0,
-            tot_out_bytes: tot_sent + 1111,
-            tot_in_bytes: tot_received + 2222,
-            tot_out_packets: tot_sent + 3333,
-            tot_in_packets: tot_received + 4444,
+            tot_data_info,
             dropped_packets: 0,
-            tot_out_bytes_prev: tot_sent,
-            tot_in_bytes_prev: tot_received,
-            tot_out_packets_prev: tot_sent,
-            tot_in_packets_prev: tot_received,
+            tot_data_info_prev,
             ..Default::default()
         };
 
@@ -292,10 +300,7 @@ mod tests {
         assert_eq!(get_max(&traffic_chart.in_bytes), 21000.0);
 
         // prev values aren't updated here anymore: manually set them
-        info_traffic.tot_out_bytes_prev = info_traffic.tot_out_bytes;
-        info_traffic.tot_in_bytes_prev = info_traffic.tot_in_bytes;
-        info_traffic.tot_out_packets_prev = info_traffic.tot_out_packets;
-        info_traffic.tot_in_packets_prev = info_traffic.tot_in_packets;
+        info_traffic.tot_data_info_prev = info_traffic.tot_data_info;
 
         let mut sent_bytes = sent.clone();
         sent_bytes
@@ -337,17 +342,20 @@ mod tests {
             received_bytes.spline.keys()
         );
 
-        info_traffic.tot_out_bytes += 99;
-        info_traffic.tot_in_packets += 990;
-        info_traffic.tot_in_bytes += 2;
+        info_traffic
+            .tot_data_info
+            .add_packets(990, 2, TrafficDirection::Incoming);
+        info_traffic
+            .tot_data_info
+            .add_packet(99, TrafficDirection::Outgoing);
         traffic_chart.update_charts_data(&info_traffic, false);
-        info_traffic.tot_out_bytes_prev = info_traffic.tot_out_bytes;
-        info_traffic.tot_in_bytes_prev = info_traffic.tot_in_bytes;
-        info_traffic.tot_out_packets_prev = info_traffic.tot_out_packets;
-        info_traffic.tot_in_packets_prev = info_traffic.tot_in_packets;
-        info_traffic.tot_out_bytes += 77;
-        info_traffic.tot_in_packets += 1;
-        info_traffic.tot_out_packets += 220;
+        info_traffic.tot_data_info_prev = info_traffic.tot_data_info;
+        info_traffic
+            .tot_data_info
+            .add_packet(0, TrafficDirection::Incoming);
+        info_traffic
+            .tot_data_info
+            .add_packets(220, 77, TrafficDirection::Outgoing);
         traffic_chart.update_charts_data(&info_traffic, false);
 
         sent_bytes.spline.remove(0);
@@ -370,7 +378,7 @@ mod tests {
         sent_packets.spline.remove(0);
         sent_packets
             .spline
-            .add(Key::new(30.0, 0.0, Interpolation::Cosine));
+            .add(Key::new(30.0, -1.0, Interpolation::Cosine));
         sent_packets
             .spline
             .add(Key::new(31.0, -220.0, Interpolation::Cosine));
diff --git a/src/gui/pages/overview_page.rs b/src/gui/pages/overview_page.rs
@@ -69,7 +69,7 @@ pub fn overview_page(sniffer: &Sniffer) -> Container<Message, StyleType> {
     } else {
         // NO pcap error detected
         let observed = sniffer.info_traffic.all_packets;
-        let filtered = sniffer.info_traffic.tot_out_packets + sniffer.info_traffic.tot_in_packets;
+        let filtered = sniffer.info_traffic.tot_data_info.tot_packets();
 
         match (observed, filtered) {
             (0, 0) => {
diff --git a/src/gui/pages/thumbnail_page.rs b/src/gui/pages/thumbnail_page.rs
@@ -27,7 +27,7 @@ pub fn thumbnail_page(sniffer: &Sniffer) -> Container<Message, StyleType> {
     let ConfigSettings { style, .. } = sniffer.configs.settings;
     let font = style.get_extension().font;
 
-    let filtered = sniffer.info_traffic.tot_out_packets + sniffer.info_traffic.tot_in_packets;
+    let filtered = sniffer.info_traffic.tot_data_info.tot_packets();
 
     if filtered == 0 {
         return Container::new(
diff --git a/src/gui/sniffer.rs b/src/gui/sniffer.rs
@@ -690,7 +690,7 @@ impl Sniffer {
         self.info_traffic.refresh(msg, &self.favorite_hosts);
         self.update_thresholds();
         let info_traffic = &self.info_traffic;
-        if info_traffic.tot_in_packets + info_traffic.tot_out_packets == 0 {
+        if info_traffic.tot_data_info.tot_packets() == 0 {
             return;
         }
         let emitted_notifications = notify_and_log(
@@ -988,7 +988,7 @@ impl Sniffer {
                 true,
             ) => {
                 // Running with no overlays
-                if self.info_traffic.tot_out_packets + self.info_traffic.tot_in_packets > 0 {
+                if self.info_traffic.tot_data_info.tot_packets() > 0 {
                     // Running with no overlays and some packets filtered
                     self.running_page = if next {
                         self.running_page.next()
@@ -1160,6 +1160,7 @@ mod tests {
     use crate::gui::types::timing_events::TimingEvents;
     use crate::networking::types::host::Host;
     use crate::networking::types::info_traffic::InfoTrafficMessage;
+    use crate::networking::types::traffic_direction::TrafficDirection;
     use crate::notifications::types::logged_notification::{
         LoggedNotification, PacketsThresholdExceeded,
     };
@@ -1696,7 +1697,10 @@ mod tests {
             ));
             // Thresholds adjustments won't be updated if `info_traffic.tot_in_packets`
             // and `info_traffic.tot_out_packets` are both `0`.
-            sniffer.info_traffic.tot_in_packets = 1;
+            sniffer
+                .info_traffic
+                .tot_data_info
+                .add_packet(0, TrafficDirection::Outgoing);
 
             // Simulate a tick to apply the settings
             sniffer.update(Message::TickRun(
@@ -1974,7 +1978,10 @@ mod tests {
         assert_eq!(sniffer.running_page, RunningPage::Overview);
         assert_eq!(sniffer.settings_page, None);
         // switch with closed setting and some packets received => change running page
-        sniffer.info_traffic.tot_in_packets += 1;
+        sniffer
+            .info_traffic
+            .tot_data_info
+            .add_packet(0, TrafficDirection::Outgoing);
         sniffer.update(Message::SwitchPage(true));
         assert_eq!(sniffer.running_page, RunningPage::Inspect);
         assert_eq!(sniffer.settings_page, None);
diff --git a/src/networking/parse_packets.rs b/src/networking/parse_packets.rs
@@ -154,7 +154,9 @@ pub fn parse_packets(
                             exchanged_bytes,
                         );
 
-                        info_traffic_msg.add_packet(exchanged_bytes, traffic_direction);
+                        info_traffic_msg
+                            .tot_data_info
+                            .add_packet(exchanged_bytes, traffic_direction);
 
                         // check the rDNS status of this address and act accordingly
                         let address_to_lookup = get_address_to_lookup(&key, traffic_direction);
diff --git a/src/networking/types/info_traffic.rs b/src/networking/types/info_traffic.rs
@@ -5,21 +5,14 @@ use crate::networking::types::data_info::DataInfo;
 use crate::networking::types::data_info_host::DataInfoHost;
 use crate::networking::types::host::Host;
 use crate::networking::types::info_address_port_pair::InfoAddressPortPair;
-use crate::networking::types::traffic_direction::TrafficDirection;
 use crate::utils::types::timestamp::Timestamp;
 use std::collections::{HashMap, HashSet};
 
 /// Struct containing overall traffic statistics and data.
 #[derive(Debug, Default)]
 pub struct InfoTraffic {
-    /// Total amount of filtered bytes received.
-    pub tot_in_bytes: u128,
-    /// Total amount of filtered bytes sent.
-    pub tot_out_bytes: u128,
-    /// Total amount of filtered packets received.
-    pub tot_in_packets: u128,
-    /// Total amount of filtered packets sent.
-    pub tot_out_packets: u128,
+    /// Total amount of exchanged data
+    pub tot_data_info: DataInfo,
     /// Total packets including those not filtered
     pub all_packets: u128,
     /// Total bytes including those not filtered
@@ -28,35 +21,24 @@ pub struct InfoTraffic {
     pub dropped_packets: u32,
     /// Timestamp of the latest parsed packet
     pub last_packet_timestamp: Timestamp,
-    /// Total sent bytes filtered before the current time interval
-    pub tot_out_bytes_prev: u128,
-    /// Total received bytes filtered before the current time interval
-    pub tot_in_bytes_prev: u128,
-    /// Total sent packets filtered before the current time interval
-    pub tot_out_packets_prev: u128,
-    /// Total received packets filtered before the current time interval
-    pub tot_in_packets_prev: u128,
     /// Map of the filtered traffic
     pub map: HashMap<AddressPortPair, InfoAddressPortPair>,
     /// Map of the upper layer services with their data info
     pub services: HashMap<Service, DataInfo>,
     /// Map of the hosts with their data info
     pub hosts: HashMap<Host, DataInfoHost>,
+    /// Total amount of exchanged data before the current time interval
+    pub tot_data_info_prev: DataInfo,
     /// Collection of favorite hosts that exchanged data in the last interval
     pub favorites_last_interval: HashSet<(Host, DataInfoHost)>,
 }
 
 impl InfoTraffic {
     pub fn refresh(&mut self, msg: InfoTrafficMessage, favorites: &HashSet<Host>) {
-        self.tot_out_bytes_prev = self.tot_out_bytes;
-        self.tot_in_bytes_prev = self.tot_in_bytes;
-        self.tot_out_packets_prev = self.tot_out_packets;
-        self.tot_in_packets_prev = self.tot_in_packets;
+        self.tot_data_info_prev = self.tot_data_info;
+
+        self.tot_data_info.refresh(msg.tot_data_info);
 
-        self.tot_in_bytes += msg.tot_in_bytes;
-        self.tot_out_bytes += msg.tot_out_bytes;
-        self.tot_in_packets += msg.tot_in_packets;
-        self.tot_out_packets += msg.tot_out_packets;
         self.all_packets += msg.all_packets;
         self.all_bytes += msg.all_bytes;
         self.dropped_packets = msg.dropped_packets;
@@ -100,17 +82,21 @@ impl InfoTraffic {
     pub fn get_thumbnail_data(&self, chart_type: ChartType) -> (u128, u128, u128, u128) {
         if chart_type.eq(&ChartType::Bytes) {
             (
-                self.tot_in_bytes,
-                self.tot_out_bytes,
-                self.all_bytes - self.tot_out_bytes - self.tot_in_bytes,
+                self.tot_data_info.incoming_bytes(),
+                self.tot_data_info.outgoing_bytes(),
+                self.all_bytes
+                    - self.tot_data_info.outgoing_bytes()
+                    - self.tot_data_info.incoming_bytes(),
                 // assume that the dropped packets have the same size as the average packet
                 u128::from(self.dropped_packets) * self.all_bytes / self.all_packets,
             )
         } else {
             (
-                self.tot_in_packets,
-                self.tot_out_packets,
-                self.all_packets - self.tot_out_packets - self.tot_in_packets,
+                self.tot_data_info.incoming_packets(),
+                self.tot_data_info.outgoing_packets(),
+                self.all_packets
+                    - self.tot_data_info.outgoing_packets()
+                    - self.tot_data_info.incoming_packets(),
                 u128::from(self.dropped_packets),
             )
         }
@@ -120,14 +106,8 @@ impl InfoTraffic {
 /// Struct containing traffic statistics and data related to the last time interval.
 #[derive(Debug, Clone, Default)]
 pub struct InfoTrafficMessage {
-    /// Total amount of filtered bytes received.
-    pub tot_in_bytes: u128,
-    /// Total amount of filtered bytes sent.
-    pub tot_out_bytes: u128,
-    /// Total amount of filtered packets received.
-    pub tot_in_packets: u128,
-    /// Total amount of filtered packets sent.
-    pub tot_out_packets: u128,
+    /// Total amount of exchanged data
+    pub tot_data_info: DataInfo,
     /// Total packets including those not filtered
     pub all_packets: u128,
     /// Total bytes including those not filtered
@@ -145,18 +125,6 @@ pub struct InfoTrafficMessage {
 }
 
 impl InfoTrafficMessage {
-    pub fn add_packet(&mut self, bytes: u128, traffic_direction: TrafficDirection) {
-        if traffic_direction == TrafficDirection::Outgoing {
-            //increment number of sent packets and bytes
-            self.tot_out_packets += 1;
-            self.tot_out_bytes += bytes;
-        } else {
-            //increment number of received packets and bytes
-            self.tot_in_packets += 1;
-            self.tot_in_bytes += bytes;
-        }
-    }
-
     pub fn take_but_leave_something(&mut self) -> Self {
         let info_traffic = Self {
             last_packet_timestamp: self.last_packet_timestamp,
diff --git a/src/notifications/notify_and_log.rs b/src/notifications/notify_and_log.rs
@@ -22,8 +22,10 @@ pub fn notify_and_log(
     let timestamp = info_traffic.last_packet_timestamp;
     // packets threshold
     if let Some(threshold) = notifications.packets_notification.threshold {
-        let sent_packets_entry = info_traffic.tot_out_packets - info_traffic.tot_out_packets_prev;
-        let received_packets_entry = info_traffic.tot_in_packets - info_traffic.tot_in_packets_prev;
+        let sent_packets_entry = info_traffic.tot_data_info.outgoing_packets()
+            - info_traffic.tot_data_info_prev.outgoing_packets();
+        let received_packets_entry = info_traffic.tot_data_info.incoming_packets()
+            - info_traffic.tot_data_info_prev.incoming_packets();
         if received_packets_entry + sent_packets_entry > u128::from(threshold) {
             // log this notification
             emitted_notifications += 1;
@@ -45,8 +47,10 @@ pub fn notify_and_log(
     }
     // bytes threshold
     if let Some(threshold) = notifications.bytes_notification.threshold {
-        let sent_bytes_entry = info_traffic.tot_out_bytes - info_traffic.tot_out_bytes_prev;
-        let received_bytes_entry = info_traffic.tot_in_bytes - info_traffic.tot_in_bytes_prev;
+        let sent_bytes_entry = info_traffic.tot_data_info.outgoing_bytes()
+            - info_traffic.tot_data_info_prev.outgoing_bytes();
+        let received_bytes_entry = info_traffic.tot_data_info.incoming_bytes()
+            - info_traffic.tot_data_info_prev.incoming_bytes();
         if received_bytes_entry + sent_bytes_entry > u128::from(threshold) {
             //log this notification
             emitted_notifications += 1;
