Use socket instead of ping command when pinging on android

Previous implementation spawned a process with tokio which in turn registered a signal handler without ONASTACK flag set. When using GO code, all signal handlers needs to have this flag set otherwise a signal might be handled on a goroutine thread which has a small stack and thus can overflow. Reference: DROID-1825 Co-authored-by: David Lönnhager <[email protected]>
mullvad · Feb 27, 2025 · 56cde3c · 56cde3c
1 parent 04b828a
commit 56cde3c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 90 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/talpid-wireguard/Cargo.toml b/talpid-wireguard/Cargo.toml
@@ -31,11 +31,6 @@ rand = "0.8.5"
 surge-ping = "0.8.0"
 rand_chacha = "0.3.1"
 wireguard-go-rs = { path = "../wireguard-go-rs"}
-
-[target.'cfg(target_os="android")'.dependencies]
-duct = "0.13"
-
-[target.'cfg(not(target_os="android"))'.dependencies]
 byteorder = "1"
 internet-checksum = "0.2"
 socket2 = { workspace = true, features = ["all"] }

diff --git a/talpid-wireguard/src/connectivity/pinger/android.rs b/talpid-wireguard/src/connectivity/pinger/android.rs
diff --git a/talpid-wireguard/src/connectivity/pinger/icmp.rs b/talpid-wireguard/src/connectivity/pinger/icmp.rs
@@ -62,11 +62,19 @@ impl Pinger {
     /// Creates a new `Pinger`.
     pub fn new(
         addr: Ipv4Addr,
-        #[cfg(not(target_os = "windows"))] interface_name: String,
+        #[cfg(any(target_os = "linux", target_os = "macos"))] interface_name: String,
     ) -> Result<Self> {
         let addr = SocketAddr::new(addr.into(), 0);
-        let sock =
-            Socket::new(Domain::IPV4, Type::RAW, Some(Protocol::ICMPV4)).map_err(Error::Open)?;
+        let sock = Socket::new(
+            Domain::IPV4,
+            if cfg!(target_os = "android") {
+                Type::DGRAM
+            } else {
+                Type::RAW
+            },
+            Some(Protocol::ICMPV4),
+        )
+        .map_err(Error::Open)?;
         sock.set_nonblocking(true).map_err(Error::Open)?;
 
         #[cfg(target_os = "linux")]

diff --git a/talpid-wireguard/src/connectivity/pinger/mod.rs b/talpid-wireguard/src/connectivity/pinger/mod.rs
@@ -1,12 +1,6 @@
-#[cfg(target_os = "android")]
-#[path = "android.rs"]
-mod imp;
+mod icmp;
 
-#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
-#[path = "icmp.rs"]
-mod imp;
-
-pub use imp::Error;
+pub use icmp::Error;
 
 /// Trait for sending ICMP requests to get some traffic from a remote server
 #[async_trait::async_trait]
@@ -22,7 +16,7 @@ pub fn new_pinger(
     addr: std::net::Ipv4Addr,
     #[cfg(any(target_os = "linux", target_os = "macos"))] interface_name: String,
 ) -> Result<Box<dyn Pinger>, Error> {
-    Ok(Box::new(imp::Pinger::new(
+    Ok(Box::new(icmp::Pinger::new(
         addr,
         #[cfg(any(target_os = "linux", target_os = "macos"))]
         interface_name,