favorite notifications: show the amount of exchanged data

Author: GyulyVGC

src/gui/pages/notifications_page.rs

@@ -7,10 +7,11 @@ use iced::widget::{Space, button, vertical_space};
 use iced::{Alignment, Font, Length};
 use std::fmt::Write;
 
-use crate::countries::country_utils::get_flag_tooltip;
+use crate::chart::types::chart_type::ChartType;
 use crate::gui::components::header::get_button_settings;
 use crate::gui::components::tab::get_pages_tabs;
 use crate::gui::components::types::my_modal::MyModal;
+use crate::gui::pages::overview_page::host_bar;
 use crate::gui::pages::types::settings_page::SettingsPage;
 use crate::gui::styles::container::ContainerType;
 use crate::gui::styles::scrollbar::ScrollbarType;
@@ -289,28 +290,18 @@ fn bytes_notification_log<'a>(
 
 fn favorite_notification_log<'a>(
     logged_notification: FavoriteTransmitted,
+    chart_type: ChartType,
     language: Language,
     font: Font,
 ) -> Container<'a, Message, StyleType> {
-    let country = logged_notification.host.country;
-    let asn = &logged_notification.host.asn;
-
-    let mut domain_asn_str = logged_notification.host.domain;
-    if !asn.name.is_empty() {
-        let _ = write!(domain_asn_str, " - {}", asn.name);
-    }
-
-    let row_flag_details = Row::new()
-        .align_y(Alignment::Center)
-        .spacing(5)
-        .push(get_flag_tooltip(
-            country,
-            &logged_notification.data_info_host,
-            language,
-            font,
-            false,
-        ))
-        .push(Text::new(domain_asn_str).font(font));
+    let host_bar = host_bar(
+        &logged_notification.host,
+        &logged_notification.data_info_host,
+        chart_type,
+        logged_notification.data_info_host.data_info,
+        font,
+        language,
+    );
 
     let content = Row::new()
         .spacing(30)
@@ -339,12 +330,8 @@ fn favorite_notification_log<'a>(
                         .font(font),
                 ),
         )
-        .push(
-            Column::new()
-                .spacing(7)
-                .width(Length::Fill)
-                .push(row_flag_details),
-        );
+        .push(Column::new().spacing(7).width(Length::Fill).push(host_bar));
+
     Container::new(content)
         .height(120)
         .width(800)
@@ -378,6 +365,7 @@ fn logged_notifications<'a>(sniffer: &Sniffer) -> Column<'a, Message, StyleType>
     let ConfigSettings {
         style, language, ..
     } = sniffer.configs.settings;
+    let chart_type = sniffer.traffic_chart.chart_type;
     let font = style.get_extension().font;
     let mut ret_val = Column::new()
         .width(830)
@@ -394,7 +382,7 @@ fn logged_notifications<'a>(sniffer: &Sniffer) -> Column<'a, Message, StyleType>
                 bytes_notification_log(byte_threshold_exceeded.clone(), language, font)
             }
             LoggedNotification::FavoriteTransmitted(favorite_transmitted) => {
-                favorite_notification_log(favorite_transmitted.clone(), language, font)
+                favorite_notification_log(favorite_transmitted.clone(), chart_type, language, font)
             }
         });
     }

src/gui/pages/overview_page.rs

@@ -18,6 +18,7 @@ use crate::gui::styles::types::palette_extension::PaletteExtension;
 use crate::gui::types::message::Message;
 use crate::networking::types::capture_context::CaptureSource;
 use crate::networking::types::data_info::DataInfo;
+use crate::networking::types::data_info_host::DataInfoHost;
 use crate::networking::types::filters::Filters;
 use crate::networking::types::host::Host;
 use crate::report::get_report_entries::{get_host_entries, get_service_entries};
@@ -256,50 +257,21 @@ fn col_host<'a>(sniffer: &Sniffer) -> Column<'a, Message, StyleType> {
         .unwrap_or_default();
 
     for (host, data_info_host) in &entries {
-        let (incoming_bar_len, outgoing_bar_len) = get_bars_length(
-            chart_type,
-            &first_entry_data_info,
-            &data_info_host.data_info,
-        );
-
         let star_button = get_star_button(data_info_host.is_favorite, host.clone());
 
-        let host_bar = Column::new()
-            .spacing(1)
-            .push(
-                Row::new()
-                    .push(Text::new(host.domain.clone()).font(font))
-                    .push(
-                        Text::new(if host.asn.name.is_empty() {
-                            String::new()
-                        } else {
-                            format!(" - {}", host.asn.name)
-                        })
-                        .font(font),
-                    )
-                    .push(horizontal_space())
-                    .push(
-                        Text::new(if chart_type.eq(&ChartType::Packets) {
-                            data_info_host.data_info.tot_packets().to_string()
-                        } else {
-                            ByteMultiple::formatted_string(data_info_host.data_info.tot_bytes())
-                        })
-                        .font(font),
-                    ),
-            )
-            .push(get_bars(incoming_bar_len, outgoing_bar_len));
+        let host_bar = host_bar(
+            host,
+            data_info_host,
+            chart_type,
+            first_entry_data_info,
+            font,
+            language,
+        );
 
         let content = Row::new()
             .align_y(Alignment::Center)
             .spacing(5)
             .push(star_button)
-            .push(get_flag_tooltip(
-                host.country,
-                data_info_host,
-                language,
-                font,
-                false,
-            ))
             .push(host_bar);
 
         scroll_host = scroll_host.push(
@@ -426,6 +398,58 @@ fn col_service<'a>(sniffer: &Sniffer) -> Column<'a, Message, StyleType> {
         )
 }
 
+pub fn host_bar<'a>(
+    host: &Host,
+    data_info_host: &DataInfoHost,
+    chart_type: ChartType,
+    first_entry_data_info: DataInfo,
+    font: Font,
+    language: Language,
+) -> Row<'a, Message, StyleType> {
+    let (incoming_bar_len, outgoing_bar_len) = get_bars_length(
+        chart_type,
+        &first_entry_data_info,
+        &data_info_host.data_info,
+    );
+
+    Row::new()
+        .align_y(Alignment::Center)
+        .spacing(5)
+        .push(get_flag_tooltip(
+            host.country,
+            data_info_host,
+            language,
+            font,
+            false,
+        ))
+        .push(
+            Column::new()
+                .spacing(1)
+                .push(
+                    Row::new()
+                        .push(Text::new(host.domain.clone()).font(font))
+                        .push(
+                            Text::new(if host.asn.name.is_empty() {
+                                String::new()
+                            } else {
+                                format!(" - {}", host.asn.name)
+                            })
+                            .font(font),
+                        )
+                        .push(horizontal_space())
+                        .push(
+                            Text::new(if chart_type.eq(&ChartType::Packets) {
+                                data_info_host.data_info.tot_packets().to_string()
+                            } else {
+                                ByteMultiple::formatted_string(data_info_host.data_info.tot_bytes())
+                            })
+                            .font(font),
+                        ),
+                )
+                .push(get_bars(incoming_bar_len, outgoing_bar_len)),
+        )
+}
+
 fn col_info<'a>(sniffer: &Sniffer) -> Container<'a, Message, StyleType> {
     let ConfigSettings {
         style, language, ..

src/gui/sniffer.rs

@@ -1109,6 +1109,15 @@ impl Sniffer {
             rdns,
         } = host_msg;
 
+        let data_info_host = DataInfoHost {
+            data_info: other_data,
+            is_favorite: false,
+            is_loopback,
+            is_local,
+            is_bogon,
+            traffic_type,
+        };
+
         self.info_traffic
             .hosts
             .entry(host.clone())
@@ -1119,14 +1128,7 @@ impl Sniffer {
                 data_info_host.is_bogon = is_bogon;
                 data_info_host.traffic_type = traffic_type;
             })
-            .or_insert_with(|| DataInfoHost {
-                data_info: other_data,
-                is_favorite: false,
-                is_loopback,
-                is_local,
-                is_bogon,
-                traffic_type,
-            });
+            .or_insert(data_info_host);
 
         self.addresses_resolved
             .insert(address_to_lookup, (rdns, host.clone()));
@@ -1136,7 +1138,9 @@ impl Sniffer {
 
         // 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);
+            self.info_traffic
+                .favorites_last_interval
+                .insert((host, data_info_host));
         }
     }
 

src/networking/manage_packets.rs

@@ -1,11 +1,9 @@
 use std::collections::HashMap;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
-use std::sync::{Arc, Mutex};
 
 use etherparse::{EtherType, LaxPacketHeaders, LinkHeader, NetHeaders, TransportHeader};
 use pcap::Address;
 
-use crate::networking::parse_packets::AddressesResolutionState;
 use crate::networking::types::address_port_pair::AddressPortPair;
 use crate::networking::types::arp_type::ArpType;
 use crate::networking::types::bogon::is_bogon;
@@ -250,7 +248,6 @@ pub fn get_service(
 }
 
 /// Function to insert the source and destination of a packet into the map containing the analyzed traffic
-#[allow(clippy::too_many_arguments)]
 pub fn modify_or_insert_in_map(
     info_traffic_msg: &mut InfoTrafficMessage,
     key: &AddressPortPair,
@@ -259,7 +256,6 @@ pub fn modify_or_insert_in_map(
     icmp_type: IcmpType,
     arp_type: ArpType,
     exchanged_bytes: u128,
-    resolutions_state: &Arc<Mutex<AddressesResolutionState>>,
 ) -> (TrafficDirection, Service) {
     let mut traffic_direction = TrafficDirection::default();
     let mut service = Service::Unknown;
@@ -280,16 +276,6 @@ pub fn modify_or_insert_in_map(
         );
         // determine upper layer service
         service = get_service(key, traffic_direction, my_interface_addresses);
-        // consider all hosts as potential favorites, then they'll be filtered in InfoTraffic::refresh
-        if let Some(host) = resolutions_state
-            .lock()
-            .unwrap()
-            .addresses_resolved
-            .get(&get_address_to_lookup(key, traffic_direction))
-            .cloned()
-        {
-            info_traffic_msg.potential_favorites.insert(host);
-        }
     }
 
     let timestamp = info_traffic_msg.last_packet_timestamp;

src/networking/parse_packets.rs

@@ -152,7 +152,6 @@ pub fn parse_packets(
                             icmp_type,
                             arp_type,
                             exchanged_bytes,
-                            &resolutions_state,
                         );
 
                         info_traffic_msg.add_packet(exchanged_bytes, traffic_direction);

src/networking/types/data_info.rs

@@ -8,7 +8,7 @@ use std::time::Instant;
 
 /// Amount of exchanged data (packets and bytes) incoming and outgoing, with the timestamp of the latest occurrence
 // data fields are private to make them only editable via the provided methods: needed to correctly refresh timestamps
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
 pub struct DataInfo {
     /// Incoming packets
     incoming_packets: u128,

src/networking/types/data_info_host.rs

@@ -4,7 +4,7 @@ use crate::networking::types::data_info::DataInfo;
 use crate::networking::types::traffic_type::TrafficType;
 
 /// Host-related information.
-#[derive(Clone, Copy, Default, Debug)]
+#[derive(Clone, Copy, Default, Debug, Eq, PartialEq, Hash)]
 pub struct DataInfoHost {
     /// Incoming and outgoing packets and bytes
     pub data_info: DataInfo,

src/networking/types/info_traffic.rs

@@ -43,7 +43,7 @@ pub struct InfoTraffic {
     /// Map of the hosts with their data info
     pub hosts: HashMap<Host, DataInfoHost>,
     /// Collection of favorite hosts that exchanged data in the last interval
-    pub favorites_last_interval: HashSet<Host>,
+    pub favorites_last_interval: HashSet<(Host, DataInfoHost)>,
 }
 
 impl InfoTraffic {
@@ -82,18 +82,19 @@ 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)
                 .and_modify(|x| x.refresh(&value))
                 .or_insert(value);
         }
-
-        self.favorites_last_interval = msg
-            .potential_favorites
-            .into_iter()
-            .filter(|h| favorites.contains(h))
-            .collect();
     }
 
     pub fn get_thumbnail_data(&self, chart_type: ChartType) -> (u128, u128, u128, u128) {
@@ -141,8 +142,6 @@ pub struct InfoTrafficMessage {
     pub services: HashMap<Service, DataInfo>,
     /// Map of the hosts with their data info
     pub hosts: HashMap<Host, DataInfoHost>,
-    /// Collection of potentially favorite hosts that exchanged data in the last interval
-    pub potential_favorites: HashSet<Host>,
 }
 
 impl InfoTrafficMessage {

src/networking/types/traffic_type.rs

@@ -1,5 +1,5 @@
 /// Enum representing the possible traffic type (unicast, multicast or broadcast).
-#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+#[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
 pub enum TrafficType {
     /// Unicast traffic
     Unicast,

src/notifications/notify_and_log.rs

@@ -1,6 +1,5 @@
 use crate::InfoTraffic;
 use crate::networking::types::capture_context::CaptureSource;
-use crate::networking::types::data_info_host::DataInfoHost;
 use crate::notifications::types::logged_notification::{
     BytesThresholdExceeded, FavoriteTransmitted, LoggedNotification, PacketsThresholdExceeded,
 };
@@ -71,17 +70,13 @@ pub fn notify_and_log(
     if notifications.favorite_notification.notify_on_favorite
         && !info_traffic.favorites_last_interval.is_empty()
     {
-        for host in info_traffic.favorites_last_interval.clone() {
+        for (host, data_info_host) in info_traffic.favorites_last_interval.clone() {
             //log this notification
             emitted_notifications += 1;
             if logged_notifications.len() >= 30 {
                 logged_notifications.pop_back();
             }
 
-            let data_info_host = *info_traffic
-                .hosts
-                .get(&host)
-                .unwrap_or(&DataInfoHost::default());
             logged_notifications.push_front(LoggedNotification::FavoriteTransmitted(
                 FavoriteTransmitted {
                     host,