Merge pull request #881 from stlankes/testtcp

return error also in the closing state
hermit-os · Sep 4, 2023 · 012430a · 012430a
2 parents a987ec4 + 73de27b
commit 012430a
Showing 1 changed file with 47 additions and 31 deletions.
diff --git a/src/fd/socket/tcp.rs b/src/fd/socket/tcp.rs
@@ -71,22 +71,29 @@ impl<T> Socket<T> {
 	#[allow(clippy::needless_pass_by_ref_mut)]
 	async fn async_read(&self, buffer: &mut [u8]) -> Result<isize, i32> {
 		future::poll_fn(|cx| {
-			self.with(|socket| {
-				if !socket.is_active() {
-					Poll::Ready(Err(-crate::errno::EIO))
-				} else if socket.can_recv() {
-					Poll::Ready(
-						socket
-							.recv(|data| {
-								let len = core::cmp::min(buffer.len(), data.len());
-								buffer[..len].copy_from_slice(&data[..len]);
-								(len, isize::try_from(len).unwrap())
-							})
-							.map_err(|_| -crate::errno::EIO),
-					)
-				} else {
-					socket.register_recv_waker(cx.waker());
-					Poll::Pending
+			self.with(|socket| match socket.state() {
+				tcp::State::Closed | tcp::State::Closing | tcp::State::CloseWait => {
+					Poll::Ready(Ok(0))
+				}
+				tcp::State::FinWait1
+				| tcp::State::FinWait2
+				| tcp::State::Listen
+				| tcp::State::TimeWait => Poll::Ready(Err(-crate::errno::EIO)),
+				_ => {
+					if socket.can_recv() {
+						Poll::Ready(
+							socket
+								.recv(|data| {
+									let len = core::cmp::min(buffer.len(), data.len());
+									buffer[..len].copy_from_slice(&data[..len]);
+									(len, isize::try_from(len).unwrap())
+								})
+								.map_err(|_| -crate::errno::EIO),
+						)
+					} else {
+						socket.register_recv_waker(cx.waker());
+						Poll::Pending
+					}
 				}
 			})
 		})
@@ -99,21 +106,30 @@ impl<T> Socket<T> {
 		while pos < buffer.len() {
 			let n = future::poll_fn(|cx| {
 				self.with(|socket| {
-					if !socket.is_active() {
-						Poll::Ready(Err(-crate::errno::EIO))
-					} else if socket.can_send() {
-						Poll::Ready(
-							socket
-								.send_slice(&buffer[pos..])
-								.map_err(|_| -crate::errno::EIO),
-						)
-					} else if pos > 0 {
-						// we already send some data => return 0 as signal to stop the
-						// async write
-						Poll::Ready(Ok(0))
-					} else {
-						socket.register_send_waker(cx.waker());
-						Poll::Pending
+					match socket.state() {
+						tcp::State::Closed | tcp::State::Closing | tcp::State::CloseWait => {
+							Poll::Ready(Ok(0))
+						}
+						tcp::State::FinWait1
+						| tcp::State::FinWait2
+						| tcp::State::Listen
+						| tcp::State::TimeWait => Poll::Ready(Err(-crate::errno::EIO)),
+						_ => {
+							if socket.can_send() {
+								Poll::Ready(
+									socket
+										.send_slice(&buffer[pos..])
+										.map_err(|_| -crate::errno::EIO),
+								)
+							} else if pos > 0 {
+								// we already send some data => return 0 as signal to stop the
+								// async write
+								Poll::Ready(Ok(0))
+							} else {
+								socket.register_send_waker(cx.waker());
+								Poll::Pending
+							}
+						}
 					}
 				})
 			})