switch to last_unsuspend

Author: dignifiedquire

netwatch/src/interfaces.rs

@@ -189,8 +189,8 @@ pub struct State {
     /// When set, its value is the map key into `interface` and `interface_ips`.
     pub default_route_interface: Option<String>,
 
-    /// Monotonic timestamp used to force [`n0_watcher::Watchable`] notifications.
-    pub last_updated: n0_future::time::Instant,
+    /// Monotonic timestamp, when an unsuspend was detected.
+    pub last_unsuspend: Option<n0_future::time::Instant>,
 }
 
 impl fmt::Display for State {
@@ -260,7 +260,7 @@ impl State {
             have_v6,
             is_expensive: false,
             default_route_interface,
-            last_updated: n0_future::time::Instant::now(),
+            last_unsuspend: None,
         }
     }
 
@@ -277,20 +277,10 @@ impl State {
             have_v4: true,
             is_expensive: false,
             default_route_interface: Some(ifname),
-            last_updated: n0_future::time::Instant::now(),
+            last_unsuspend: None,
         }
     }
 
-    /// Compares network state ignoring `last_updated`.
-    pub fn eq_ignoring_timestamp(&self, other: &State) -> bool {
-        self.interfaces == other.interfaces
-            && self.local_addresses == other.local_addresses
-            && self.have_v6 == other.have_v6
-            && self.have_v4 == other.have_v4
-            && self.is_expensive == other.is_expensive
-            && self.default_route_interface == other.default_route_interface
-    }
-
     /// Is this a major change compared to the `old` one?.
     pub fn is_major_change(&self, old: &State) -> bool {
         if self.have_v6 != old.have_v6

netwatch/src/interfaces/wasm_browser.rs

@@ -79,8 +79,8 @@ pub struct State {
     /// The URL to the Proxy Autoconfig URL, if applicable.
     pub(crate) pac: Option<String>,
 
-    /// Monotonic timestamp used to force [`n0_watcher::Watchable`] notifications.
-    pub last_updated: Instant,
+    /// Monotonic timestamp, when an unsuspend was detected.
+    pub last_unsuspend: Option<n0_future::time::Instant>,
 }
 
 impl fmt::Display for State {
@@ -121,21 +121,10 @@ impl State {
             default_route_interface: Some(BROWSER_INTERFACE.to_string()),
             http_proxy: None,
             pac: None,
-            last_updated: Instant::now(),
+            last_unsuspend: None,
         }
     }
 
-    /// Compares network state ignoring `last_updated`.
-    pub fn eq_ignoring_timestamp(&self, other: &State) -> bool {
-        self.interfaces == other.interfaces
-            && self.have_v6 == other.have_v6
-            && self.have_v4 == other.have_v4
-            && self.is_expensive == other.is_expensive
-            && self.default_route_interface == other.default_route_interface
-            && self.http_proxy == other.http_proxy
-            && self.pac == other.pac
-    }
-
     /// Is this a major change compared to the `old` one?.
     pub fn is_major_change(&self, old: &State) -> bool {
         // All changes are major.

netwatch/src/netmon/actor.rs

@@ -143,11 +143,13 @@ impl Actor {
     async fn handle_potential_change(&mut self, time_jumped: bool) {
         trace!("potential change");
 
-        let new_state = State::new().await;
+        let mut new_state = State::new().await;
         let old_state = &self.interface_state.get();
 
-        // No major changes, continue on
-        if !time_jumped && old_state.eq_ignoring_timestamp(&new_state) {
+        if time_jumped {
+            new_state.last_unsuspend.replace(Instant::now());
+        } else if old_state == &new_state {
+            // No major changes, continue on
             debug!("no changes detected");
             return;
         }