Merge branch 'upgrade-to-latest-tonic-012-des-1237'

Cargo.toml

@@ -66,12 +66,15 @@ unused_async = "deny"
 
 [workspace.dependencies]
 tokio = { version = "1.8" }
+parity-tokio-ipc = "0.9"
+futures = "0.3.15"
 # Tonic and related crates
-tonic = "0.10.0"
+tonic = "0.12.2"
 tonic-build = { version = "0.10.0", default-features = false }
 tower = "0.4"
-prost = "0.12.0"
-prost-types = "0.12.0"
+prost = "0.13.3"
+prost-types = "0.13.3"
+hyper-util = "0.1.8"
 
 env_logger = "0.10.0"
 thiserror = "1.0.57"

mullvad-api/Cargo.toml

@@ -18,7 +18,7 @@ api-override = []
 libc = "0.2"
 chrono = { workspace = true }
 thiserror = { workspace = true }
-futures = "0.3"
+futures = { workspace = true }
 http = "0.2"
 hyper = { version = "0.14", features = ["client", "stream", "http1", "tcp" ] }
 ipnetwork = { workspace = true }

mullvad-cli/Cargo.toml

@@ -19,7 +19,7 @@ anyhow = "1.0"
 chrono = { workspace = true }
 clap = { workspace = true }
 thiserror = { workspace = true }
-futures = "0.3"
+futures = { workspace = true }
 itertools = "0.10"
 natord = "1.0.9"
 

mullvad-daemon/Cargo.toml

@@ -19,7 +19,7 @@ chrono = { workspace = true }
 thiserror = { workspace = true }
 either = "1.11"
 fern = { version = "0.6", features = ["colored"] }
-futures = "0.3"
+futures = { workspace = true }
 libc = "0.2"
 log = { workspace = true }
 regex = "1.0"

mullvad-ios/Cargo.toml

@@ -15,6 +15,7 @@ libc = "0.2"
 log = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 tonic = { workspace = true }
+hyper-util = { workspace = true }
 tower = { workspace = true }
 tunnel-obfuscation = { path = "../tunnel-obfuscation" }
 oslog = "0.2"

mullvad-ios/src/ephemeral_peer_proxy/ios_runtime.rs

@@ -3,10 +3,7 @@ use super::{
 };
 use libc::c_void;
 use std::{
-    future::Future,
-    io,
-    pin::Pin,
-    ptr,
+    io, ptr,
     sync::{Arc, Mutex},
 };
 use talpid_tunnel_config_client::{request_ephemeral_peer_with, Error, RelayConfigService};
@@ -104,14 +101,13 @@ impl IOSRuntime {
         // One (1) TCP connection
         let mut one_tcp_connection = Some(tcp_provider);
         let conn = endpoint
-            .connect_with_connector(service_fn(
-                move |_| -> Pin<Box<dyn Future<Output = _> + Send>> {
-                    if let Some(connection) = one_tcp_connection.take() {
-                        return Box::pin(async move { Ok::<_, Error>(connection) });
-                    }
-                    Box::pin(async { Err(Error::TcpConnectionExpired) })
-                },
-            ))
+            .connect_with_connector(service_fn(move |_| {
+                let connection = one_tcp_connection
+                    .take()
+                    .map(hyper_util::rt::tokio::TokioIo::new)
+                    .ok_or(Error::TcpConnectionExpired);
+                async { connection }
+            }))
             .await
             .map_err(Error::GrpcConnectError)?;
 

mullvad-jni/Cargo.toml

@@ -21,7 +21,7 @@ crate-type = ["cdylib"]
 tokio = { workspace = true, features = ["rt"] }
 
 thiserror = { workspace = true }
-futures = "0.3"
+futures = { workspace = true }
 ipnetwork = { workspace = true }
 jnix = { version = "0.5.1", features = ["derive"] }
 log = { workspace = true }