improve HostMessage ergonomics

Author: GyulyVGC

src/gui/sniffer.rs

@@ -46,7 +46,6 @@ use crate::mmdb::types::mmdb_reader::{MmdbReader, MmdbReaders};
 use crate::networking::parse_packets::BackendTrafficMessage;
 use crate::networking::parse_packets::parse_packets;
 use crate::networking::types::capture_context::{CaptureContext, CaptureSource, MyPcapImport};
-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::host_data_states::HostDataStates;
@@ -1100,33 +1099,16 @@ impl Sniffer {
     fn handle_new_host(&mut self, host_msg: HostMessage) {
         let HostMessage {
             host,
-            other_data,
-            is_loopback,
-            is_local,
-            is_bogon,
-            traffic_type,
+            data_info_host,
             address_to_lookup,
             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())
-            .and_modify(|data_info_host| {
-                data_info_host.data_info.refresh(other_data);
-                data_info_host.is_loopback = is_loopback;
-                data_info_host.is_local = is_local;
-                data_info_host.is_bogon = is_bogon;
-                data_info_host.traffic_type = traffic_type;
+            .and_modify(|d| {
+                d.refresh(&data_info_host);
             })
             .or_insert(data_info_host);
 

src/networking/parse_packets.rs

@@ -388,13 +388,18 @@ fn reverse_dns_lookup(
         .insert(address_to_lookup, new_host.clone());
     drop(resolutions_lock);
 
-    let msg_data = HostMessage {
-        host: new_host,
-        other_data,
-        is_loopback,
+    let data_info_host = DataInfoHost {
+        data_info: other_data,
+        is_favorite: false,
         is_local,
         is_bogon,
+        is_loopback,
         traffic_type,
+    };
+
+    let msg_data = HostMessage {
+        host: new_host,
+        data_info_host,
         address_to_lookup,
         rdns,
     };

src/networking/types/host.rs

@@ -1,7 +1,6 @@
 use crate::countries::types::country::Country;
 use crate::networking::types::asn::Asn;
-use crate::networking::types::data_info::DataInfo;
-use crate::networking::types::traffic_type::TrafficType;
+use crate::networking::types::data_info_host::DataInfoHost;
 use std::net::IpAddr;
 
 /// Struct to represent a network host
@@ -30,11 +29,7 @@ pub struct ThumbnailHost {
 #[derive(Clone, Debug)]
 pub struct HostMessage {
     pub host: Host,
-    pub other_data: DataInfo,
-    pub is_loopback: bool,
-    pub is_local: bool,
-    pub is_bogon: Option<&'static str>,
-    pub traffic_type: TrafficType,
+    pub data_info_host: DataInfoHost,
     pub address_to_lookup: IpAddr,
     pub rdns: String,
 }