refactor: unify InfoTraffic and InfoTrafficMessage structs

Author: GyulyVGC

src/chart/manage_chart_data.rs

@@ -4,32 +4,25 @@ use crate::TrafficChart;
 use crate::networking::types::info_traffic::InfoTraffic;
 
 impl TrafficChart {
-    pub fn update_charts_data(&mut self, info_traffic: &InfoTraffic, no_more_packets: bool) {
+    pub fn update_charts_data(&mut self, info_traffic_msg: &InfoTraffic, no_more_packets: bool) {
         self.no_more_packets = no_more_packets;
 
         if self.ticks == 0 {
-            self.first_packet_timestamp = info_traffic.last_packet_timestamp;
+            self.first_packet_timestamp = info_traffic_msg.last_packet_timestamp;
         }
 
         #[allow(clippy::cast_precision_loss)]
         let tot_seconds = self.ticks as f32;
         self.ticks += 1;
 
         #[allow(clippy::cast_precision_loss)]
-        let out_bytes_entry = -1.0
-            * (info_traffic.tot_data_info.outgoing_bytes()
-                - info_traffic.tot_data_info_prev.outgoing_bytes()) as f32;
+        let out_bytes_entry = -1.0 * info_traffic_msg.tot_data_info.outgoing_bytes() as f32;
         #[allow(clippy::cast_precision_loss)]
-        let in_bytes_entry = (info_traffic.tot_data_info.incoming_bytes()
-            - info_traffic.tot_data_info_prev.incoming_bytes()) as f32;
+        let in_bytes_entry = info_traffic_msg.tot_data_info.incoming_bytes() as f32;
         #[allow(clippy::cast_precision_loss)]
-        let out_packets_entry = -1.0
-            * (info_traffic.tot_data_info.outgoing_packets()
-                - info_traffic.tot_data_info_prev.outgoing_packets()) as f32;
+        let out_packets_entry = -1.0 * info_traffic_msg.tot_data_info.outgoing_packets() as f32;
         #[allow(clippy::cast_precision_loss)]
-        let in_packets_entry = (info_traffic.tot_data_info.incoming_packets()
-            - info_traffic.tot_data_info_prev.incoming_packets())
-            as f32;
+        let in_packets_entry = info_traffic_msg.tot_data_info.incoming_packets() as f32;
 
         let out_bytes_point = (tot_seconds, out_bytes_entry);
         let in_bytes_point = (tot_seconds, in_bytes_entry);
@@ -168,7 +161,6 @@ mod tests {
 
     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};
 
@@ -254,16 +246,7 @@ mod tests {
             spline: received_spl,
             all_time: vec![],
         };
-        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 tot_data_info = DataInfo::new_for_tests(4444, 3333, 2222, 1111);
         let mut traffic_chart = TrafficChart {
             ticks: 29,
             out_bytes: sent.clone(),
@@ -287,7 +270,6 @@ mod tests {
             all_packets: 0,
             tot_data_info,
             dropped_packets: 0,
-            tot_data_info_prev,
             ..Default::default()
         };
 
@@ -299,9 +281,6 @@ mod tests {
         assert_eq!(get_min(&traffic_chart.out_packets), -3333.0);
         assert_eq!(get_max(&traffic_chart.in_bytes), 21000.0);
 
-        // prev values aren't updated here anymore: manually set them
-        info_traffic.tot_data_info_prev = info_traffic.tot_data_info;
-
         let mut sent_bytes = sent.clone();
         sent_bytes
             .spline
@@ -342,20 +321,9 @@ mod tests {
             received_bytes.spline.keys()
         );
 
-        info_traffic
-            .tot_data_info
-            .add_packets(990, 2, TrafficDirection::Incoming);
-        info_traffic
-            .tot_data_info
-            .add_packet(99, TrafficDirection::Outgoing);
+        info_traffic.tot_data_info = DataInfo::new_for_tests(990, 1, 2, 99);
         traffic_chart.update_charts_data(&info_traffic, false);
-        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);
+        info_traffic.tot_data_info = DataInfo::new_for_tests(1, 220, 0, 77);
         traffic_chart.update_charts_data(&info_traffic, false);
 
         sent_bytes.spline.remove(0);

src/gui/sniffer.rs

@@ -49,7 +49,7 @@ use crate::networking::types::capture_context::{CaptureContext, CaptureSource, M
 use crate::networking::types::filters::Filters;
 use crate::networking::types::host::{Host, HostMessage};
 use crate::networking::types::host_data_states::HostDataStates;
-use crate::networking::types::info_traffic::InfoTrafficMessage;
+use crate::networking::types::info_traffic::InfoTraffic;
 use crate::networking::types::ip_collection::AddressCollection;
 use crate::networking::types::my_device::MyDevice;
 use crate::networking::types::port_collection::PortCollection;
@@ -68,7 +68,7 @@ use crate::utils::check_updates::set_newer_release_status;
 use crate::utils::error_logger::{ErrorLogger, Location};
 use crate::utils::types::file_info::FileInfo;
 use crate::utils::types::web_page::WebPage;
-use crate::{ConfigSettings, Configs, InfoTraffic, StyleType, TrafficChart, location};
+use crate::{ConfigSettings, Configs, StyleType, TrafficChart, location};
 
 pub const FONT_FAMILY_NAME: &str = "Sarasa Mono SC for Sniffnet";
 pub const ICON_FONT_FAMILY_NAME: &str = "Icons for Sniffnet";
@@ -686,25 +686,23 @@ impl Sniffer {
         }
     }
 
-    fn refresh_data(&mut self, msg: InfoTrafficMessage, no_more_packets: bool) {
-        self.info_traffic.refresh(msg, &self.favorite_hosts);
-        self.update_thresholds();
-        let info_traffic = &self.info_traffic;
-        if info_traffic.tot_data_info.tot_packets() == 0 {
-            return;
-        }
+    fn refresh_data(&mut self, msg: InfoTraffic, no_more_packets: bool) {
+        self.traffic_chart.update_charts_data(&msg, no_more_packets);
         let emitted_notifications = notify_and_log(
             &mut self.logged_notifications,
             self.configs.settings.notifications,
-            info_traffic,
+            &msg,
+            &self.favorite_hosts,
             &self.capture_source,
         );
-        self.info_traffic.favorites_last_interval = HashSet::new();
+        self.info_traffic.refresh(msg);
+        self.update_thresholds();
+        if self.info_traffic.tot_data_info.tot_packets() == 0 {
+            return;
+        }
         if self.thumbnail || self.running_page.ne(&RunningPage::Notifications) {
             self.unread_notifications += emitted_notifications;
         }
-        self.traffic_chart
-            .update_charts_data(&self.info_traffic, no_more_packets);
 
         if let CaptureSource::Device(device) = &self.capture_source {
             let current_device_name = device.get_name().clone();
@@ -1117,13 +1115,6 @@ impl Sniffer {
 
         // update host data states including the new host
         self.host_data_states.data.update(&host);
-
-        // check if the newly resolved host was featured in the favorites (possible in case of already existing host)
-        if self.favorite_hosts.contains(&host) {
-            self.info_traffic
-                .favorites_last_interval
-                .insert((host, data_info_host));
-        }
     }
 
     fn register_sigint_handler() -> Task<Message> {
@@ -1160,7 +1151,7 @@ mod tests {
     use crate::gui::types::timing_events::TimingEvents;
     use crate::networking::types::data_info::DataInfo;
     use crate::networking::types::host::Host;
-    use crate::networking::types::info_traffic::InfoTrafficMessage;
+    use crate::networking::types::info_traffic::InfoTraffic;
     use crate::networking::types::traffic_direction::TrafficDirection;
     use crate::notifications::types::logged_notification::{
         DataThresholdExceeded, LoggedNotification,
@@ -1704,12 +1695,7 @@ mod tests {
                 .add_packet(0, TrafficDirection::Outgoing);
 
             // Simulate a tick to apply the settings
-            sniffer.update(Message::TickRun(
-                0,
-                InfoTrafficMessage::default(),
-                vec![],
-                false,
-            ));
+            sniffer.update(Message::TickRun(0, InfoTraffic::default(), vec![], false));
         }
         let mut sniffer = Sniffer::new(Configs::default());
 
@@ -1921,14 +1907,14 @@ mod tests {
     #[parallel] // needed to not collide with other tests generating configs files
     fn test_clear_all_notifications() {
         let mut sniffer = Sniffer::new(Configs::default());
-        sniffer.logged_notifications =
-            VecDeque::from([LoggedNotification::PacketsThresholdExceeded(
-                DataThresholdExceeded {
-                    threshold: 0,
-                    data_info: DataInfo::default(),
-                    timestamp: "".to_string(),
-                },
-            )]);
+        sniffer.logged_notifications = VecDeque::from([LoggedNotification::DataThresholdExceeded(
+            DataThresholdExceeded {
+                chart_type: ChartType::Packets,
+                threshold: 0,
+                data_info: DataInfo::default(),
+                timestamp: "".to_string(),
+            },
+        )]);
 
         assert_eq!(sniffer.modal, None);
         sniffer.update(Message::ShowModal(MyModal::ClearAll));

src/gui/types/message.rs

@@ -6,7 +6,7 @@ use crate::gui::pages::types::running_page::RunningPage;
 use crate::gui::pages::types::settings_page::SettingsPage;
 use crate::gui::styles::types::gradient_type::GradientType;
 use crate::networking::types::host::{Host, HostMessage};
-use crate::networking::types::info_traffic::InfoTrafficMessage;
+use crate::networking::types::info_traffic::InfoTraffic;
 use crate::notifications::types::notifications::Notification;
 use crate::report::types::search_parameters::SearchParameters;
 use crate::report::types::sort_type::SortType;
@@ -20,7 +20,7 @@ pub enum Message {
     /// Run tasks to initialize the app
     StartApp(Option<window::Id>),
     /// Sent by the backend parsing packets; includes the capture id, new data, new hosts batched data, and whether an offline capture has finished
-    TickRun(usize, InfoTrafficMessage, Vec<HostMessage>, bool),
+    TickRun(usize, InfoTraffic, Vec<HostMessage>, bool),
     /// Select network device
     DeviceSelection(String),
     /// Select IP filter

src/networking/manage_packets.rs

@@ -10,7 +10,7 @@ use crate::networking::types::bogon::is_bogon;
 use crate::networking::types::capture_context::CaptureSource;
 use crate::networking::types::icmp_type::{IcmpType, IcmpTypeV4, IcmpTypeV6};
 use crate::networking::types::info_address_port_pair::InfoAddressPortPair;
-use crate::networking::types::info_traffic::InfoTrafficMessage;
+use crate::networking::types::info_traffic::InfoTraffic;
 use crate::networking::types::packet_filters_fields::PacketFiltersFields;
 use crate::networking::types::service::Service;
 use crate::networking::types::service_query::ServiceQuery;
@@ -249,7 +249,7 @@ pub fn get_service(
 
 /// Function to insert the source and destination of a packet into the map containing the analyzed traffic
 pub fn modify_or_insert_in_map(
-    info_traffic_msg: &mut InfoTrafficMessage,
+    info_traffic_msg: &mut InfoTraffic,
     key: &AddressPortPair,
     cs: &CaptureSource,
     mac_addresses: (Option<String>, Option<String>),

src/networking/parse_packets.rs

@@ -17,7 +17,7 @@ use crate::networking::types::data_info_host::DataInfoHost;
 use crate::networking::types::filters::Filters;
 use crate::networking::types::host::{Host, HostMessage};
 use crate::networking::types::icmp_type::IcmpType;
-use crate::networking::types::info_traffic::InfoTrafficMessage;
+use crate::networking::types::info_traffic::InfoTraffic;
 use crate::networking::types::my_link_type::MyLinkType;
 use crate::networking::types::packet_filters_fields::PacketFiltersFields;
 use crate::networking::types::traffic_direction::TrafficDirection;
@@ -48,7 +48,7 @@ pub fn parse_packets(
     let my_link_type = capture_context.my_link_type();
     let (mut cap, mut savefile) = capture_context.consume();
 
-    let mut info_traffic_msg = InfoTrafficMessage::default();
+    let mut info_traffic_msg = InfoTraffic::default();
     let resolutions_state = Arc::new(Mutex::new(AddressesResolutionState::default()));
     // list of newly resolved hosts to be sent (batched to avoid UI updates too often)
     let new_hosts_to_send = Arc::new(Mutex::new(Vec::new()));
@@ -420,14 +420,14 @@ pub struct AddressesResolutionState {
 
 #[allow(clippy::large_enum_variant)]
 pub enum BackendTrafficMessage {
-    TickRun(usize, InfoTrafficMessage, Vec<HostMessage>, bool),
+    TickRun(usize, InfoTraffic, Vec<HostMessage>, bool),
     PendingHosts(usize, Vec<HostMessage>),
     OfflineGap(usize, u32),
 }
 
 fn maybe_send_tick_run_live(
     cap_id: usize,
-    info_traffic_msg: &mut InfoTrafficMessage,
+    info_traffic_msg: &mut InfoTraffic,
     new_hosts_to_send: &Arc<Mutex<Vec<HostMessage>>>,
     cs: &mut CaptureSource,
     first_packet_ticks: &mut Option<Instant>,
@@ -453,7 +453,7 @@ fn maybe_send_tick_run_live(
 
 fn maybe_send_tick_run_offline(
     cap_id: usize,
-    info_traffic_msg: &mut InfoTrafficMessage,
+    info_traffic_msg: &mut InfoTraffic,
     new_hosts_to_send: &Arc<Mutex<Vec<HostMessage>>>,
     next_packet_timestamp: Timestamp,
     tx: &Sender<BackendTrafficMessage>,

src/networking/types/data_info.rs

@@ -96,13 +96,6 @@ impl DataInfo {
         self.final_instant = rhs.final_instant;
     }
 
-    pub fn subtract(&mut self, rhs: Self) {
-        self.incoming_packets -= rhs.incoming_packets;
-        self.outgoing_packets -= rhs.outgoing_packets;
-        self.incoming_bytes -= rhs.incoming_bytes;
-        self.outgoing_bytes -= rhs.outgoing_bytes;
-    }
-
     pub fn compare(&self, other: &Self, sort_type: SortType, chart_type: ChartType) -> Ordering {
         match chart_type {
             ChartType::Packets => match sort_type {

src/networking/types/info_traffic.rs

@@ -6,10 +6,10 @@ 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::utils::types::timestamp::Timestamp;
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
 
 /// Struct containing overall traffic statistics and data.
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Clone)]
 pub struct InfoTraffic {
     /// Total amount of exchanged data
     pub tot_data_info: DataInfo,
@@ -27,16 +27,10 @@ pub struct InfoTraffic {
     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_data_info_prev = self.tot_data_info;
-
+    pub fn refresh(&mut self, msg: InfoTraffic) {
         self.tot_data_info.refresh(msg.tot_data_info);
 
         self.all_packets += msg.all_packets;
@@ -64,13 +58,6 @@ impl InfoTraffic {
                 .or_insert(value);
         }
 
-        self.favorites_last_interval = msg
-            .hosts
-            .iter()
-            .filter(|(h, _)| favorites.contains(h))
-            .map(|(h, data)| (h.clone(), *data))
-            .collect();
-
         for (key, value) in msg.hosts {
             self.hosts
                 .entry(key)
@@ -101,30 +88,7 @@ impl InfoTraffic {
             )
         }
     }
-}
-
-/// Struct containing traffic statistics and data related to the last time interval.
-#[derive(Debug, Clone, Default)]
-pub struct InfoTrafficMessage {
-    /// 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
-    pub all_bytes: u128,
-    /// Number of dropped packets
-    pub dropped_packets: u32,
-    /// Timestamp of the latest parsed packet
-    pub last_packet_timestamp: Timestamp,
-    /// 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>,
-}
 
-impl InfoTrafficMessage {
     pub fn take_but_leave_something(&mut self) -> Self {
         let info_traffic = Self {
             last_packet_timestamp: self.last_packet_timestamp,