Update `ping_monitor` to support Android

1 files changed, 21 insertions, 18 deletions

diff --git a/talpid-core/src/tunnel/wireguard/ping_monitor.rs b/talpid-core/src/tunnel/wireguard/ping_monitor.rs
index 69f22fc83f..89b13ee637 100644
--- a/talpid-core/src/tunnel/wireguard/ping_monitor.rs
+++ b/talpid-core/src/tunnel/wireguard/ping_monitor.rs
@@ -48,30 +48,29 @@ fn ping_cmd(
     interface: &str,
     exit_on_first_reply: bool,
 ) -> duct::Expression {
-    let interface_flag = if cfg!(target_os = "linux") {
-        "-I"
-    } else {
-        "-b"
-    };
-    let timeout_flag = if cfg!(target_os = "linux") {
+    let mut args = vec!["-n", "-i", "1"];
+
+    let timeout_flag = if cfg!(target_os = "linux") || cfg!(target_os = "android") {
         "-w"
     } else {
         "-t"
     };
-
     let timeout_secs = timeout_secs.to_string();
-    let ip = ip.to_string();
 
-    let mut args = vec![
-        "-n",
-        "-i",
-        "1",
-        &interface_flag,
-        &interface,
-        timeout_flag,
-        &timeout_secs,
-        &ip,
-    ];
+    args.extend_from_slice(&[timeout_flag, &timeout_secs]);
+
+    let interface_flag = if cfg!(target_os = "linux") {
+        Some("-I")
+    } else if cfg!(target_os = "macos") {
+        Some("-b")
+    } else {
+        None
+    };
+
+    if let Some(interface_flag) = interface_flag {
+        args.extend_from_slice(&[interface_flag, interface]);
+    }
+
     if exit_on_first_reply {
         if cfg!(target_os = "macos") {
             args.push("-o");
@@ -79,6 +78,10 @@ fn ping_cmd(
             args.extend_from_slice(&["-c", "1"])
         }
     }
+
+    let ip = ip.to_string();
+    args.push(&ip);
+
     duct::cmd("ping", args)
         .stdin_null()
         .stdout_null()