diff options
| -rw-r--r-- | talpid-core/src/ping_monitor/mod.rs | 16 | ||||
| -rw-r--r-- | talpid-core/src/ping_monitor/unix.rs | 27 | ||||
| -rw-r--r-- | talpid-core/src/ping_monitor/win.rs | 15 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/connectivity_check.rs | 22 |
4 files changed, 49 insertions, 31 deletions
diff --git a/talpid-core/src/ping_monitor/mod.rs b/talpid-core/src/ping_monitor/mod.rs index bc148a5892..c5e2a256e5 100644 --- a/talpid-core/src/ping_monitor/mod.rs +++ b/talpid-core/src/ping_monitor/mod.rs @@ -7,4 +7,18 @@ mod imp; #[path = "win.rs"] mod imp; -pub use imp::{Error, Pinger}; +pub use imp::Error; + +pub trait Pinger: Send { + /// Sends an ICMP packet + fn send_icmp(&mut self) -> Result<(), Error>; + /// Clears all resources used by the pinger. + fn reset(&mut self) {} +} + +pub fn new_pinger( + addr: std::net::Ipv4Addr, + interface_name: String, +) -> Result<Box<dyn Pinger>, Error> { + Ok(Box::new(imp::Pinger::new(addr, interface_name)?)) +} diff --git a/talpid-core/src/ping_monitor/unix.rs b/talpid-core/src/ping_monitor/unix.rs index 7e0953289f..4207f0db04 100644 --- a/talpid-core/src/ping_monitor/unix.rs +++ b/talpid-core/src/ping_monitor/unix.rs @@ -25,8 +25,21 @@ impl Pinger { }) } + + fn try_deplete_process_list(&mut self) { + self.processes.retain(|child| { + match child.try_wait() { + // child has terminated, doesn't have to be retained + Ok(Some(_)) => false, + _ => true, + } + }); + } +} + +impl super::Pinger for Pinger { // Send an ICMP packet without waiting for a reply - pub fn send_icmp(&mut self) -> Result<(), Error> { + fn send_icmp(&mut self) -> Result<(), Error> { self.try_deplete_process_list(); let cmd = ping_cmd(self.addr, 1, &self.interface_name); @@ -35,7 +48,7 @@ impl Pinger { Ok(()) } - pub fn reset(&mut self) { + fn reset(&mut self) { let processes = std::mem::replace(&mut self.processes, vec![]); for proc in processes { if proc @@ -49,16 +62,6 @@ impl Pinger { } } } - - fn try_deplete_process_list(&mut self) { - self.processes.retain(|child| { - match child.try_wait() { - // child has terminated, doesn't have to be retained - Ok(Some(_)) => false, - _ => true, - } - }); - } } impl Drop for Pinger { diff --git a/talpid-core/src/ping_monitor/win.rs b/talpid-core/src/ping_monitor/win.rs index c2fd16dd9d..e2564b3943 100644 --- a/talpid-core/src/ping_monitor/win.rs +++ b/talpid-core/src/ping_monitor/win.rs @@ -60,13 +60,6 @@ impl Pinger { }) } - pub fn send_icmp(&mut self) -> Result<()> { - let dest = SocketAddr::new(IpAddr::from(self.addr), 0); - let request = self.next_ping_request(); - self.send_ping_request(&request, dest) - } - - fn send_ping_request( &mut self, request: &EchoRequestPacket<'static>, @@ -117,3 +110,11 @@ impl Pinger { seq } } + +impl super::Pinger for Pinger { + fn send_icmp(&mut self) -> Result<()> { + let dest = SocketAddr::new(IpAddr::from(self.addr), 0); + let request = self.next_ping_request(); + self.send_ping_request(&request, dest) + } +} diff --git a/talpid-core/src/tunnel/wireguard/connectivity_check.rs b/talpid-core/src/tunnel/wireguard/connectivity_check.rs index d6d56b29bb..73cdff92e4 100644 --- a/talpid-core/src/tunnel/wireguard/connectivity_check.rs +++ b/talpid-core/src/tunnel/wireguard/connectivity_check.rs @@ -1,4 +1,7 @@ -use crate::{ping_monitor::Pinger, tunnel::wireguard::stats::Stats}; +use crate::{ + ping_monitor::{new_pinger, Pinger}, + tunnel::wireguard::stats::Stats, +}; use std::{ net::Ipv4Addr, sync::{mpsc, Mutex, Weak}, @@ -66,7 +69,7 @@ pub struct ConnectivityMonitor { conn_state: ConnState, initial_ping_timestamp: Option<Instant>, num_pings_sent: u32, - pinger: Pinger, + pinger: Box<dyn Pinger>, close_receiver: mpsc::Receiver<()>, } @@ -78,7 +81,7 @@ impl ConnectivityMonitor { tunnel_handle: Weak<Mutex<Option<Box<dyn Tunnel>>>>, close_receiver: mpsc::Receiver<()>, ) -> Result<Self, Error> { - let pinger = Pinger::new(addr, interface).map_err(Error::PingError)?; + let pinger = new_pinger(addr, interface).map_err(Error::PingError)?; let now = Instant::now(); @@ -100,15 +103,13 @@ impl ConnectivityMonitor { } let start = Instant::now(); - let mut now = start; while start.elapsed() < PING_TIMEOUT { - if self.check_connectivity(now)? { + if self.check_connectivity(Instant::now())? { return Ok(true); } if self.should_shut_down(DELAY_ON_INITIAL_SETUP) { return Ok(false); } - now = Instant::now(); } Ok(false) } @@ -131,7 +132,7 @@ impl ConnectivityMonitor { let mut current_iteration = Instant::now(); let time_slept = current_iteration - last_iteration; if time_slept < (iter_delay * 2) { - if !self.check_connectivity(current_iteration)? { + if !self.check_connectivity(Instant::now())? { return Ok(()); } @@ -162,7 +163,7 @@ impl ConnectivityMonitor { return Ok(true); } - self.maybe_send_ping()?; + self.maybe_send_ping(now)?; Ok(!self.ping_timed_out() && self.conn_state.connected()) } } @@ -179,7 +180,7 @@ impl ConnectivityMonitor { .map(|tunnel| tunnel.get_tunnel_stats().map_err(Error::ConfigReadError)) } - fn maybe_send_ping(&mut self) -> Result<(), Error> { + fn maybe_send_ping(&mut self, now: Instant) -> Result<(), Error> { // Only send out a ping if we haven't received a byte in a while or no traffic has flowed // in the last 2 minutes, but if a ping already has been sent out, only send one out every // 3 seconds. @@ -193,7 +194,7 @@ impl ConnectivityMonitor { { self.pinger.send_icmp().map_err(Error::PingError)?; if self.initial_ping_timestamp.is_none() { - self.initial_ping_timestamp = Some(Instant::now()); + self.initial_ping_timestamp = Some(now); } self.num_pings_sent += 1; } @@ -210,7 +211,6 @@ impl ConnectivityMonitor { fn reset_pinger(&mut self) { self.initial_ping_timestamp = None; self.num_pings_sent = 0; - #[cfg(unix)] self.pinger.reset(); } } |