VPN capabilities.

core/gsb-api/src/api.rs

@@ -1,3 +1,4 @@
+#![allow(non_snake_case)]
 use crate::model::{
     GsbApiError, ServiceListenResponse, ServicePath, ServiceRequest, ServiceResponse,
 };
@@ -367,8 +368,7 @@ mod tests {
 
         verify_delete_service(&mut api, &service_addr).await;
     }
-
-    #[test_case(r#"{}"#, Frame::Close(Some(CloseReason { 
+    #[test_case(r#"{}"#, Frame::Close(Some(CloseReason {
         code: CloseCode::Policy,
         description: Some("Failed to read response. Err: Missing root map. Err: Empty map".to_string()) })); 
         "Close when empty"

core/vpn/Cargo.toml

@@ -40,6 +40,10 @@ tokio-stream = "0.1.6"
 uuid = { version = "0.8", features = ["v4"] }
 
 [features]
+# Add log for outgoing and incoming packets for VPN RAW
+# It includes transport bypassing smalltcp stack
+trace-raw-packets = []
+# Trace for VPN packets
 packet-trace-enable = ["ya-packet-trace/enable"]
 default = []
 

core/vpn/src/lib.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::unit_arg)]
 mod message;
 mod network;
 mod requestor;

core/vpn/src/message.rs

@@ -1,6 +1,7 @@
 use crate::Result;
 use actix::{Message, Recipient};
 use futures::channel::mpsc;
+use std::net::IpAddr;
 use ya_client_model::net::*;
 use ya_utils_networking::vpn::{
     stack::{
@@ -42,24 +43,38 @@ pub struct RemoveNode {
 pub struct GetConnections;
 
 #[derive(Message)]
-#[rtype(result = "Result<UserConnection>")]
-pub struct Connect {
+#[rtype(result = "Result<UserTcpConnection>")]
+pub struct ConnectTcp {
     pub protocol: Protocol,
     pub address: String,
     pub port: u16,
 }
 
+#[derive(Debug, Clone, Eq, Hash, PartialEq)]
+pub struct RawSocketDesc {
+    pub src_addr: IpAddr,
+    pub dst_addr: IpAddr,
+    pub dst_id: String,
+}
+
+#[derive(Debug, Message)]
+#[rtype(result = "Result<UserRawConnection>")]
+pub struct ConnectRaw {
+    pub raw_socket_desc: RawSocketDesc,
+}
+
 #[derive(Debug, Message)]
 #[rtype(result = "Result<()>")]
-pub struct Disconnect {
+pub struct DisconnectTcp {
     pub desc: SocketDesc,
     pub reason: DisconnectReason,
 }
 
-impl Disconnect {
-    pub fn new(desc: SocketDesc, reason: DisconnectReason) -> Self {
-        Self { desc, reason }
-    }
+#[derive(Debug, Message)]
+#[rtype(result = "Result<()>")]
+pub struct DisconnectRaw {
+    pub raw_socket_desc: RawSocketDesc,
+    pub reason: DisconnectReason,
 }
 
 #[derive(Message)]
@@ -78,12 +93,17 @@ pub struct Shutdown;
 pub struct DataSent;
 
 #[derive(Debug)]
-pub struct UserConnection {
+pub struct UserTcpConnection {
     pub vpn: Recipient<Packet>,
     pub rx: mpsc::Receiver<Vec<u8>>,
     pub stack_connection: Connection,
 }
 
+#[derive(Debug)]
+pub struct UserRawConnection {
+    pub rx: mpsc::Receiver<Vec<u8>>,
+}
+
 #[derive(Clone, Debug)]
 pub enum DisconnectReason {
     SinkClosed,