Upgrade tonic and prost

Upgrade `tonic` to version 0.12, as a prerequisite
to later on upgrading `hyper`.

As of version 1, `hyper` no longer uses tokios `AsyncWriter`
and `AsyncReader` traits, instead defining its own versions,
see <hyperium/hyper#3110>. As tonic
`0.12` is updated to use the `hyper 1.0` ecosystem, it changed
some of its trait-bounds to the new `hyper` traits. The `hyper-utils`
crate provides the wrapper `TokioIo`, which converts between the two.

`prost` had to be upgraded as well, for compatibility.

Cargo.toml

@@ -67,11 +67,12 @@ unused_async = "deny"
 [workspace.dependencies]
 tokio = { version = "1.8" }
 # 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-management-interface/Cargo.toml

@@ -18,6 +18,7 @@ mullvad-paths = { path = "../mullvad-paths" }
 talpid-types = { path = "../talpid-types" }
 tonic = { workspace = true }
 tower = { workspace = true }
+hyper-util = { workspace = true }
 prost = { workspace = true }
 prost-types = { workspace = true }
 parity-tokio-ipc = "0.9"

mullvad-management-interface/src/lib.rs

@@ -117,12 +117,14 @@ pub enum Error {
 #[cfg(not(target_os = "android"))]
 #[deprecated(note = "Prefer MullvadProxyClient")]
 pub async fn new_rpc_client() -> Result<ManagementServiceClient, Error> {
+    use futures::TryFutureExt;
+
     let ipc_path = mullvad_paths::get_rpc_socket_path();
 
     // The URI will be ignored
     let channel = Endpoint::from_static("lttp://[::]:50051")
         .connect_with_connector(service_fn(move |_: Uri| {
-            IpcEndpoint::connect(ipc_path.clone())
+            IpcEndpoint::connect(ipc_path.clone()).map_ok(hyper_util::rt::tokio::TokioIo::new)
         }))
         .await
         .map_err(Error::GrpcTransportError)?;

talpid-openvpn-plugin/Cargo.toml

@@ -26,6 +26,8 @@ talpid-types = { path = "../talpid-types" }
 tonic = { workspace = true }
 tower = { workspace = true }
 prost = { workspace = true }
+hyper-util = { workspace = true }
+futures = { workspace = true }
 
 [build-dependencies]
 tonic-build = { workspace = true, default-features = false, features = ["transport", "prost"] }

talpid-openvpn-plugin/src/processing.rs

@@ -1,11 +1,11 @@
 use super::{Arguments, Error};
-use parity_tokio_ipc::Endpoint as IpcEndpoint;
 use std::collections::HashMap;
-use tower::service_fn;
-
-use tonic::transport::{Endpoint, Uri};
 
+use futures::TryFutureExt;
+use parity_tokio_ipc::Endpoint as IpcEndpoint;
 use tokio::runtime::{self, Runtime};
+use tonic::transport::{Endpoint, Uri};
+use tower::service_fn;
 
 #[allow(clippy::derive_partial_eq_without_eq)]
 mod proto {
@@ -42,7 +42,7 @@ impl EventProcessor {
         // The URI will be ignored
         let channel = Endpoint::from_static("lttp://[::]:50051")
             .connect_with_connector(service_fn(move |_: Uri| {
-                IpcEndpoint::connect(ipc_path.clone())
+                IpcEndpoint::connect(ipc_path.clone()).map_ok(hyper_util::rt::tokio::TokioIo::new)
             }))
             .await?;
 

talpid-tunnel-config-client/Cargo.toml

@@ -17,6 +17,7 @@ talpid-types = { path = "../talpid-types" }
 tonic = { workspace = true }
 tower = { workspace = true }
 prost = { workspace = true }
+hyper-util = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 classic-mceliece-rust = { version = "2.0.0", features = [
     "mceliece460896f",

talpid-tunnel-config-client/src/lib.rs

@@ -258,9 +258,10 @@ async fn new_client(addr: Ipv4Addr) -> Result<RelayConfigService, Error> {
 
             #[cfg(not(target_os = "windows"))]
             try_set_tcp_sock_mtu(&addr, sock.as_raw_fd(), CONFIG_CLIENT_MTU);
-
-            sock.connect(SocketAddr::new(addr, CONFIG_SERVICE_PORT))
-                .await
+            let stream = sock
+                .connect(SocketAddr::new(addr, CONFIG_SERVICE_PORT))
+                .await?;
+            Ok::<_, std::io::Error>(hyper_util::rt::tokio::TokioIo::new(stream))
         }))
         .await
         .map_err(Error::GrpcConnectError)?;