Implement Vsock connection

Signed-off-by: Alexander V. Nikolaev <[email protected]>

Cargo.toml

@@ -25,6 +25,7 @@ http-body = "0.4.2"
 hyper = "0.14"
 tokio = {version = "1.0", features = ["rt-multi-thread", "time", "macros"]}
 tokio-stream = "0.1"
+tokio-vsock = "0.5"
 tonic = {version="0.12.2", features = ["tls"]}
 tonic-types = {version="0.12.2"}
 tonic-reflection = {version="0.12.2"}

client/Cargo.toml

@@ -15,6 +15,7 @@ http-body = "0.4.2"
 hyper-util = { version = "0.1.4"}
 tokio = {version = "1.0", features = ["rt-multi-thread", "time", "macros"]}
 tokio-stream = "0.1"
+tokio-vsock = "*"
 tonic = {version="0.12.2", features = ["tls"]}
 tonic-types = {version="0.12.2"}
 tower = {version = "0.4"}

client/src/endpoint.rs

@@ -4,6 +4,7 @@ use std::time::Duration;
 use anyhow::anyhow;
 use hyper_util::rt::TokioIo;
 use tokio::net::UnixStream;
+use tokio_vsock::{VsockAddr, VsockStream};
 use tonic::transport::{Certificate, Channel, ClientTlsConfig, Identity, ServerTlsConfig};
 use tonic::transport::{Endpoint, Uri};
 use tower::service_fn;
@@ -88,6 +89,17 @@ async fn connect_unix_socket(endpoint: Endpoint, path: &String) -> anyhow::Resul
     Ok(ch)
 }
 
+async fn connect_vsock_socket(endpoint: Endpoint, vs: &VsockAddr) -> anyhow::Result<Channel> {
+    let vs = vs.to_owned();
+    let ch = endpoint
+        .connect_with_connector(service_fn(move |_: Uri| async move {
+            let stream = VsockStream::connect(vs).await?;
+            Ok::<_, std::io::Error>(TokioIo::new(stream))
+        }))
+        .await?;
+    Ok(ch)
+}
+
 impl EndpointConfig {
     pub async fn connect(&self) -> anyhow::Result<Channel> {
         let url = transport_config_to_url(&self.transport.address, self.tls.is_some());
@@ -102,6 +114,7 @@ impl EndpointConfig {
             EndpointAddress::Tcp { .. } => endpoint.connect().await?,
             EndpointAddress::Unix(unix) => connect_unix_socket(endpoint, unix).await?,
             EndpointAddress::Abstract(abs) => connect_unix_socket(endpoint, abs).await?,
+            EndpointAddress::Vsock(vs) => connect_vsock_socket(endpoint, vs).await?,
         };
         Ok(channel)
     }

common/Cargo.toml

@@ -14,6 +14,7 @@ http-body = "0.4.2"
 prost = "0.13"
 tokio = {version = "1.0", features = ["rt-multi-thread", "time", "macros"]}
 tokio-stream = "0.1"
+tokio-vsock = "*"
 tonic = {version="0.12.2", features = ["tls"]}
 tonic-types = {version="0.12.2"}
 tracing = "0.1"

common/src/address.rs

@@ -2,7 +2,7 @@ use std::convert::{Into, TryFrom};
 //use std::net::SocketAddr;
 use std::path::PathBuf;
 
-// use tokio_vsock::VsockAddr;
+use tokio_vsock::VsockAddr;
 
 use crate::pb;
 
@@ -13,7 +13,7 @@ pub enum EndpointAddress {
         addr: String,
         port: u16,
     },
-    Unix(String), // "/path/to/sock"  (same host only)
+    Unix(String),     // "/path/to/sock"  (same host only)
     Abstract(String), // "@abstract-socket-name" (same host only)
-                  // VSock(VsockAddr), // cid+port. FIXME: cid have two magic numbers for host and local
+    Vsock(VsockAddr), // cid+port. FIXME: cid have two magic numbers for host and local
 }

common/src/types.rs

@@ -2,9 +2,11 @@
 // Some of them would be rewritten, replaced, or even removed
 use super::address::EndpointAddress;
 use crate::pb;
-use anyhow::{anyhow, bail};
 use std::convert::{Into, TryFrom};
 
+use anyhow::{anyhow, bail};
+use tokio_vsock::VsockAddr;
+
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub struct UnitType {
     pub vm: VmType,
@@ -198,7 +200,9 @@ impl TryFrom<pb::TransportConfig> for EndpointEntry {
             },
             "unix" => EndpointAddress::Unix(tc.address),
             "abstract" => EndpointAddress::Abstract(tc.address),
-            // "vsock" => unimplemented!(),
+            "vsock" => {
+                EndpointAddress::Vsock(VsockAddr::new(tc.address.parse()?, tc.port.parse()?))
+            }
             unknown => bail!("Unknown protocol: {unknown}"),
         };
         Ok(Self {
@@ -229,12 +233,12 @@ impl Into<pb::TransportConfig> for EndpointEntry {
                 port: "".into(),
                 name: self.tls_name,
             },
-            //            EndpointAddress::Vsock(vs) => pb::TransportConfig {
-            //                protocol: "vsock".into(),
-            //                address: vs.cid().to_string(),
-            //                port: vs.port().to_string(),
-            //                name: self.tls_name,
-            //            }
+            EndpointAddress::Vsock(vs) => pb::TransportConfig {
+                protocol: "vsock".into(),
+                address: vs.cid().to_string(),
+                port: vs.port().to_string(),
+                name: self.tls_name,
+            },
         }
     }
 }