Add sized ping

Author: Serock3

test/Cargo.lock

@@ -7,12 +7,7 @@ rust-version = "1.75.0"
 
 [workspace]
 resolver = "2"
-members = [
-    "test-manager",
-    "test-runner",
-    "test-rpc",
-    "socks-server",
-]
+members = ["test-manager", "test-runner", "test-rpc", "socks-server"]
 
 [workspace.lints.rust]
 rust_2018_idioms = "deny"
@@ -22,7 +17,15 @@ unused_async = "deny"
 
 [workspace.dependencies]
 futures = "0.3"
-tokio = { version = "1.8", features = ["macros", "rt", "process", "time", "fs", "io-util", "rt-multi-thread"] }
+tokio = { version = "1.8", features = [
+  "macros",
+  "rt",
+  "process",
+  "time",
+  "fs",
+  "io-util",
+  "rt-multi-thread",
+] }
 tokio-serial = "5.4.1"
 # Serde and related crates
 serde = "1.0"
@@ -46,8 +49,9 @@ shadowsocks-service = { version = "1.16" }
 
 windows-sys = "0.48.0"
 
-chrono = { version = "0.4.26", default-features = false}
+chrono = { version = "0.4.26", default-features = false }
 clap = { version = "4.2.7", features = ["cargo", "derive"] }
 once_cell = "1.16.0"
 bytes = "1.3.0"
 async-trait = "0.1.58"
+surge-ping = "0.8"

test/Cargo.toml

@@ -181,7 +181,23 @@ pub async fn ping_with_timeout(
     dest: IpAddr,
     interface: Option<String>,
 ) -> Result<(), Error> {
-    timeout(PING_TIMEOUT, rpc.send_ping(interface, dest))
+    const DEFAULT_PING_SIZE: usize = 64;
+    timeout(
+        PING_TIMEOUT,
+        rpc.send_ping(dest, interface, DEFAULT_PING_SIZE),
+    )
+    .await
+    .map_err(|_| Error::PingTimeout)?
+    .map_err(Error::Rpc)
+}
+
+pub async fn ping_sized_with_timeout(
+    rpc: &ServiceClient,
+    dest: IpAddr,
+    interface: Option<String>,
+    size: usize,
+) -> Result<(), Error> {
+    timeout(PING_TIMEOUT, rpc.send_ping(dest, interface, size))
         .await
         .map_err(|_| Error::PingTimeout)?
         .map_err(Error::Rpc)

test/test-manager/src/tests/helpers.rs

@@ -178,11 +178,12 @@ impl ServiceClient {
     /// Send ICMP
     pub async fn send_ping(
         &self,
-        interface: Option<String>,
         destination: IpAddr,
+        interface: Option<String>,
+        size: usize,
     ) -> Result<(), Error> {
         self.client
-            .send_ping(tarpc::context::current(), interface, destination)
+            .send_ping(tarpc::context::current(), destination, interface, size)
             .await?
     }
 

test/test-rpc/src/client.rs

@@ -38,7 +38,7 @@ pub enum Error {
     #[error(display = "Failed to send TCP segment")]
     SendTcp,
     #[error(display = "Failed to send ping")]
-    Ping,
+    Ping(String),
     #[error(display = "Failed to get or set registry value")]
     Registry(String),
     #[error(display = "Failed to change the service")]
@@ -136,7 +136,11 @@ mod service {
         ) -> Result<(), Error>;
 
         /// Send ICMP
-        async fn send_ping(interface: Option<String>, destination: IpAddr) -> Result<(), Error>;
+        async fn send_ping(
+            destination: IpAddr,
+            interface: Option<String>,
+            size: usize,
+        ) -> Result<(), Error>;
 
         /// Fetch the current location.
         async fn geoip_lookup(mullvad_host: String) -> Result<AmIMullvad, Error>;
@@ -175,7 +179,8 @@ mod service {
             verbosity_level: mullvad_daemon::Verbosity,
         ) -> Result<(), Error>;
 
-        /// Set environment variables for the daemon service. This will restart the daemon system service.
+        /// Set environment variables for the daemon service. This will restart the daemon system
+        /// service.
         async fn set_daemon_environment(env: HashMap<String, String>) -> Result<(), Error>;
 
         /// Copy a file from `src` to `dest` on the test runner.

test/test-rpc/src/lib.rs

@@ -23,6 +23,8 @@ bytes = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tokio-serde = { workspace = true }
+surge-ping = { workspace = true }
+rand = "0.8"
 
 libc = "0.2"
 chrono = { workspace = true, features = ["serde"] }
@@ -42,12 +44,12 @@ winreg = "0.50"
 [target.'cfg(windows)'.dependencies.windows-sys]
 version = "0.45.0"
 features = [
-    "Win32_Foundation",
-    "Win32_Security",
-    "Win32_System_Shutdown",
-    "Win32_System_SystemServices",
-    "Win32_System_Threading",
-    "Win32_UI_WindowsAndMessaging",
+  "Win32_Foundation",
+  "Win32_Security",
+  "Win32_System_Shutdown",
+  "Win32_System_SystemServices",
+  "Win32_System_Threading",
+  "Win32_UI_WindowsAndMessaging",
 ]
 
 [dependencies.tokio-util]

test/test-runner/Cargo.toml

@@ -6,19 +6,18 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use tarpc::context;
-use tarpc::server::Channel;
+use tarpc::{context, server::Channel};
 use test_rpc::{
     mullvad_daemon::{ServiceStatus, SOCKET_PATH},
     net::SockHandleId,
     package::Package,
     transport::GrpcForwarder,
     AppTrace, Service,
 };
-use tokio::sync::broadcast::error::TryRecvError;
 use tokio::{
     io::{AsyncReadExt, AsyncWriteExt},
     process::Command,
+    sync::broadcast::error::TryRecvError,
 };
 use tokio_util::codec::{Decoder, LengthDelimitedCodec};
 
@@ -141,10 +140,13 @@ impl Service for TestServer {
     async fn send_ping(
         self,
         _: context::Context,
-        interface: Option<String>,
         destination: IpAddr,
+        interface: Option<String>,
+        size: usize,
     ) -> Result<(), test_rpc::Error> {
-        net::send_ping(interface.as_deref(), destination).await
+        net::send_ping(destination, interface.as_deref(), size)
+            .await
+            .map_err(|e| test_rpc::Error::Ping(e.to_string()))
     }
 
     async fn geoip_lookup(