refactor(interfaces): Rename interface to interface_name where appropriate

6 files changed, 15 insertions, 11 deletions

diff --git a/src/display/components/table.rs b/src/display/components/table.rs
index aef914e..c8b6779 100644
--- a/src/display/components/table.rs
+++ b/src/display/components/table.rs
@@ -64,7 +64,11 @@ impl<'a> Table<'a> {
             .iter()
             .map(|(connection, connection_data)| {
                 vec![
-                    display_connection_string(&connection, &ip_to_host, &connection_data.interface),
+                    display_connection_string(
+                        &connection,
+                        &ip_to_host,
+                        &connection_data.interface_name,
+                    ),
                     connection_data.process_name.to_string(),
                     display_upload_and_download(*connection_data),
                 ]
diff --git a/src/display/ui.rs b/src/display/ui.rs
index fd137bc..e58c3e9 100644
--- a/src/display/ui.rs
+++ b/src/display/ui.rs
@@ -56,7 +56,7 @@ where
                 display_connection_string(
                     connection,
                     ip_to_host,
-                    &connection_network_data.interface
+                    &connection_network_data.interface_name
                 ),
                 connection_network_data.total_bytes_uploaded,
                 connection_network_data.total_bytes_downloaded,
diff --git a/src/display/ui_state.rs b/src/display/ui_state.rs
index d374c01..e5c2217 100644
--- a/src/display/ui_state.rs
+++ b/src/display/ui_state.rs
@@ -20,7 +20,7 @@ pub struct ConnectionData {
     pub total_bytes_downloaded: u128,
     pub total_bytes_uploaded: u128,
     pub process_name: String,
-    pub interface: String,
+    pub interface_name: String,
 }
 
 impl Bandwidth for ConnectionData {
@@ -74,7 +74,7 @@ impl UIState {
                 connection_data.total_bytes_downloaded += connection_info.total_bytes_downloaded;
                 connection_data.total_bytes_uploaded += connection_info.total_bytes_uploaded;
                 connection_data.process_name = process_name;
-                connection_data.interface = connection_info.interface;
+                connection_data.interface_name = connection_info.interface_name;
                 data_for_remote_address.total_bytes_downloaded +=
                     connection_info.total_bytes_downloaded;
                 data_for_remote_address.total_bytes_uploaded +=
diff --git a/src/network/connection.rs b/src/network/connection.rs
index bd42525..b4e0de2 100644
--- a/src/network/connection.rs
+++ b/src/network/connection.rs
@@ -52,11 +52,11 @@ pub fn display_ip_or_host(ip: Ipv4Addr, ip_to_host: &HashMap<Ipv4Addr, String>)
 pub fn display_connection_string(
     connection: &Connection,
     ip_to_host: &HashMap<Ipv4Addr, String>,
-    interface: &str,
+    interface_name: &str,
 ) -> String {
     format!(
         "<{}>:{} => {}:{} ({})",
-        interface,
+        interface_name,
         connection.local_port,
         display_ip_or_host(connection.remote_socket.ip, ip_to_host),
         connection.remote_socket.port,
diff --git a/src/network/sniffer.rs b/src/network/sniffer.rs
index 7b2d0b0..4c19731 100644
--- a/src/network/sniffer.rs
+++ b/src/network/sniffer.rs
@@ -14,7 +14,7 @@ use ::std::net::{IpAddr, SocketAddr};
 use crate::network::{Connection, Protocol};
 
 pub struct Segment {
-    pub interface: String,
+    pub interface_name: String,
     pub connection: Connection,
     pub direction: Direction,
     pub data_length: u128,
@@ -82,7 +82,7 @@ impl Sniffer {
                         }
                         _ => return None,
                     };
-                let interface = self.network_interface.name.clone();
+                let interface_name = self.network_interface.name.clone();
                 let direction = Direction::new(&self.network_interface.ips, &ip_packet);
                 let from = SocketAddr::new(IpAddr::V4(ip_packet.get_source()), source_port);
                 let to = SocketAddr::new(IpAddr::V4(ip_packet.get_destination()), destination_port);
@@ -92,7 +92,7 @@ impl Sniffer {
                     Direction::Upload => Connection::new(to, source_port, protocol)?,
                 };
                 Some(Segment {
-                    interface,
+                    interface_name,
                     connection,
                     data_length,
                     direction,
diff --git a/src/network/utilization.rs b/src/network/utilization.rs
index 6cd732f..bdfbb21 100644
--- a/src/network/utilization.rs
+++ b/src/network/utilization.rs
@@ -4,7 +4,7 @@ use ::std::collections::HashMap;
 
 #[derive(Clone)]
 pub struct ConnectionInfo {
-    pub interface: String,
+    pub interface_name: String,
     pub total_bytes_downloaded: u128,
     pub total_bytes_uploaded: u128,
 }
@@ -29,7 +29,7 @@ impl Utilization {
             .connections
             .entry(seg.connection)
             .or_insert(ConnectionInfo {
-                interface: seg.interface,
+                interface_name: seg.interface_name,
                 total_bytes_downloaded: 0,
                 total_bytes_uploaded: 0,
             });