Remove stale IPv4 detection from ARP cache

Author: josephrhobbs

proton_arp/src/arp.rs

@@ -1,9 +1,6 @@
 //! Address resolution manager.
 
-use std::{
-    net::Ipv4Addr,
-    time::Duration,
-};
+use std::net::Ipv4Addr;
 
 use cidr::Ipv4Cidr;
 
@@ -31,15 +28,13 @@ impl ArpManager {
     /// 
     /// # Parameters
     /// - `range` (`Ipv4Cidr`): the CIDR range of the network
-    /// - `refresh` (`Duration`): the amount of time after which ARP
-    /// cache entries should be refreshed.
-    /// ArpCache
+    /// 
     /// # Returns
     /// A new `ArpManager` with an empty cache.
-    pub fn new(range: Ipv4Cidr, refresh: Duration) -> Self {
+    pub fn new(range: Ipv4Cidr) -> Self {
         Self {
             range,
-            cache: ArpCache::new(refresh),
+            cache: ArpCache::new(),
         }
     }
 
@@ -69,22 +64,6 @@ impl ArpManager {
         Ok (())
     }
 
-    /// Refresh the cache without scanning for new devices.
-    /// 
-    /// # Parameters
-    /// None.
-    /// 
-    /// # Returns
-    /// An `ArpResult` indicating whether or not the refresh was successful.
-    pub async fn refresh(&mut self) -> ArpResult {
-        let addresses = self.cache.get_stale_ips();
-
-        // Scan the network and update the cache
-        self.cache.set(scan(addresses).await?);
-
-        Ok (())
-    }
-
     /// Get an iterator of the cache, without consuming the cache.
     /// 
     /// # Parameters

proton_arp/src/cache.rs

@@ -19,24 +19,19 @@ use pnet::datalink::MacAddr;
 pub struct ArpCache {
     /// Cache entries consisting of IPv4 addresses, MAC addresses, and the times of caching.
     cache: Vec<ArpCacheEntry>,
-
-    /// The amount of time after which an ARP cache entry should be refreshed.
-    refresh: Duration,
 }
 
 impl ArpCache {
     /// Construct a new ARP cache.
     /// 
     /// # Parameters
-    /// - `refresh` (`Duration`): the amount of time after which ARP cache
-    /// entries should be refreshed
+    /// None.
     /// 
     /// # Returns
     /// A new, empty `ArpCache`.
-    pub fn new(refresh: Duration) -> Self {
+    pub fn new() -> Self {
         Self {
             cache: Vec::new(),
-            refresh,
         }
     }
 
@@ -66,26 +61,6 @@ impl ArpCache {
     pub fn set(&mut self, cache: Vec<ArpCacheEntry>) {
         self.cache = cache;
     }
-
-    /// Get a list of stale addresses in the ARP cache.
-    /// 
-    /// # Parameters
-    /// None.
-    /// 
-    /// # Returns
-    /// A `Vec<Ipv4Addr>` with a list of stale IPv4 addresses to check.
-    pub fn get_stale_ips(&mut self) -> Vec<Ipv4Addr> {
-        let mut stale_ips = Vec::new();
-
-        for entry in &self.cache {
-            // Check if the entry needs to be refreshed
-            if entry.check(self.refresh) {
-                stale_ips.push(entry.ipv4);
-            }
-        }
-
-        stale_ips
-    }
 }
 
 impl IntoIterator for ArpCache {

proton_dev/src/manager.rs

@@ -1,7 +1,5 @@
 //! Device discovery manager.
 
-use std::time::Duration;
-
 use cidr::Ipv4Cidr;
 
 use neli::err::NlError;
@@ -38,16 +36,14 @@ impl DeviceManager {
     /// 
     /// # Parameters
     /// - `range` (`Ipv4Cidr`): the CIDR range of the network
-    /// - `refresh` (`Duration`): the amount of time after which to refresh
-    /// the ARP cache
     /// 
     /// # Returns
     /// The result type `NetlinkResult<DeviceManager>` containing the device
     /// manager, if its initialization was successful.
-    pub fn new(range: Ipv4Cidr, refresh: Duration) -> NetlinkResult<Self> {
+    pub fn new(range: Ipv4Cidr) -> NetlinkResult<Self> {
         Ok (Self {
             socket: Socket::connect()?,
-            arp_manager: ArpManager::new(range, refresh),
+            arp_manager: ArpManager::new(range),
         })
     }
 
@@ -59,7 +55,12 @@ impl DeviceManager {
     /// # Returns
     /// The result type `NetlinkResult<Vec<Device>>` containing a list of
     /// connected devices.
-    pub fn scan(&mut self, ifname: &str) -> NetlinkResult<Vec<Device>> {
+    pub async fn scan(&mut self, ifname: &str) -> NetlinkResult<Vec<Device>> {
+        // Perform an ARP scan of the network to get IPs
+        if self.arp_manager.scan().await.is_err() {
+            return Err (NlError::Msg ("could not scan network".to_string()));
+        };
+
         // Determine Wi-Fi device by name
         let check_wifi_device = |iface: &Interface| parse_string(&iface.name.clone().unwrap_or_default()) == ifname;