Merge pull request #1460 from microsoft/enhancement-inetstack-receiver

[inetstack] Enhancement: Add receiver to arch
microsoft · Nov 18, 2024 · 6c8a75a · 6c8a75a
2 parents de43532 + 6554338
commit 6c8a75a
Show file tree

Hide file tree

Showing 9 changed files with 885 additions and 890 deletions.
diff --git a/src/rust/inetstack/protocols/layer4/tcp/active_open.rs b/src/rust/inetstack/protocols/layer4/tcp/active_open.rs
@@ -74,7 +74,6 @@ impl SharedActiveOpenSocket {
         remote: SocketAddrV4,
         runtime: SharedDemiRuntime,
         layer3_endpoint: SharedLayer3Endpoint,
-        recv_queue: SharedAsyncQueue<(Ipv4Addr, TcpHeader, DemiBuffer)>,
         tcp_config: TcpConfig,
         default_socket_options: TcpSocketOptions,
         dead_socket_tx: mpsc::UnboundedSender<QDesc>,
@@ -87,7 +86,7 @@ impl SharedActiveOpenSocket {
             remote,
             runtime: runtime.clone(),
             layer3_endpoint,
-            recv_queue,
+            recv_queue: SharedAsyncQueue::default(),
             tcp_config,
             socket_options: default_socket_options,
             dead_socket_tx,
@@ -160,7 +159,7 @@ impl SharedActiveOpenSocket {
             }
         }
 
-        let (local_window_scale, remote_window_scale): (u32, u8) = match remote_window_scale {
+        let (local_window_scale, remote_window_scale): (u8, u8) = match remote_window_scale {
             Some(remote_window_scale) => {
                 let remote: u8 = if remote_window_scale as usize > MAX_WINDOW_SCALE {
                     warn!(
@@ -171,7 +170,7 @@ impl SharedActiveOpenSocket {
                 } else {
                     remote_window_scale
                 };
-                (self.tcp_config.get_window_scale() as u32, remote)
+                (self.tcp_config.get_window_scale() as u8, remote)
             },
             None => (0, 0),
         };
@@ -214,7 +213,6 @@ impl SharedActiveOpenSocket {
             congestion_control::None::new,
             None,
             self.dead_socket_tx.clone(),
-            None,
         )?)
     }
 
@@ -297,6 +295,10 @@ impl SharedActiveOpenSocket {
     pub fn endpoints(&self) -> (SocketAddrV4, SocketAddrV4) {
         (self.local, self.remote)
     }
+
+    pub fn receive(&mut self, ipv4_addr: Ipv4Addr, tcp_hdr: TcpHeader, buf: DemiBuffer) {
+        self.recv_queue.push((ipv4_addr, tcp_hdr, buf))
+    }
 }
 
 //======================================================================================================================

diff --git a/src/rust/inetstack/protocols/layer4/tcp/established/background/acknowledger.rs b/src/rust/inetstack/protocols/layer4/tcp/established/background/acknowledger.rs
diff --git a/src/rust/inetstack/protocols/layer4/tcp/established/background/mod.rs b/src/rust/inetstack/protocols/layer4/tcp/established/background/mod.rs