Incoming fixed in layer

Razz4780 · Oct 2, 2023 · 3fd9acc · 3fd9acc
1 parent 0dfb55b
commit 3fd9acc
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 877 deletions.
diff --git a/mirrord/intproxy/src/codec.rs b/mirrord/intproxy/src/codec.rs
@@ -45,6 +45,10 @@ impl<T, W> SyncSender<T, W> {
             _phantom: Default::default(),
         }
     }
+
+    pub fn into_inner(self) -> W {
+        self.writer
+    }
 }
 
 impl<T, W> SyncSender<T, W>
@@ -80,6 +84,10 @@ impl<T, R> SyncReceiver<T, R> {
             _phantom: Default::default(),
         }
     }
+
+    pub fn into_inner(self) -> R {
+        self.reader
+    }
 }
 
 impl<T, R> SyncReceiver<T, R>
@@ -134,6 +142,10 @@ impl<T, W> AsyncSender<T, W> {
             _phantom: Default::default(),
         }
     }
+
+    pub fn into_inner(self) -> W {
+        self.writer
+    }
 }
 
 impl<T, W> AsyncSender<T, W>
@@ -169,6 +181,10 @@ impl<T, R> AsyncReceiver<T, R> {
             _phantom: Default::default(),
         }
     }
+
+    pub fn into_inner(self) -> R {
+        self.reader
+    }
 }
 
 impl<T, R> AsyncReceiver<T, R>

diff --git a/mirrord/intproxy/src/protocol.rs b/mirrord/intproxy/src/protocol.rs
@@ -98,6 +98,7 @@ pub enum IncomingRequest {
 #[derive(Encode, Decode, Debug)]
 pub struct PortSubscribe {
     pub port: Port,
+    pub listening_on: SocketAddress,
 }
 
 #[derive(Encode, Decode, Debug)]
@@ -118,12 +119,9 @@ pub enum ProxyToLayerMessage {
     /// A response to layer's [`OutgoingConnectRequest`]
     OutgoingConnect(RemoteResult<OutgoingConnectResponse>),
     /// A response to layer's [`PortSubscribe`]
-    Incoming(PortSubscribeResult),
-}
-
-#[derive(Encode, Decode, Debug)]
-pub struct PortSubscribeResult {
-    result: RemoteResult<()>,
+    IncomingSubscribe(RemoteResult<()>),
+    /// A response to layer's [`PortUnsubscribe`]
+    IncomingUbsubscribe(RemoteResult<()>),
 }
 
 /// A response to layer's [`OutgoingConnectRequest`].
@@ -387,14 +385,16 @@ impl_request!(
 
 impl_request!(
     req = PortSubscribe,
-    res = PortSubscribeResult,
+    res = RemoteResult<()>,
     req_path = LayerToProxyMessage::Incoming => IncomingRequest::PortSubscribe,
-    res_path = ProxyToLayerMessage::Incoming,
+    res_path = ProxyToLayerMessage::IncomingSubscribe,
 );
 
 impl_request!(
     req = PortUnsubscribe,
+    res = RemoteResult<()>,
     req_path = LayerToProxyMessage::Incoming => IncomingRequest::PortUnsubscribe,
+    res_path = ProxyToLayerMessage::IncomingUbsubscribe,
 );
 
 #[test]

diff --git a/mirrord/layer/src/error.rs b/mirrord/layer/src/error.rs
@@ -92,7 +92,7 @@ pub(crate) enum HookError {
     #[error("mirrord-layer: Ignored file")]
     FileNotFound,
 
-    #[error("mirrord-layer: Proxy connection failed with `{0}`")]
+    #[error("mirrord-layer: Proxy connection failed: `{0}`")]
     ProxyError(#[from] ProxyError),
 }
 

diff --git a/mirrord/layer/src/incoming/mirror.rs b/mirrord/layer/src/incoming/mirror.rs
diff --git a/mirrord/layer/src/incoming/mod.rs b/mirrord/layer/src/incoming/mod.rs