From 0580c2c76141807d46e1034d0b6b86f7ef83009f Mon Sep 17 00:00:00 2001 From: Connor-GH Date: Mon, 19 Jan 2026 14:11:26 -0600 Subject: [PATCH] Fix 'shutdown' regression We did not update the relibc version needed for redox-rt or generic-rt. Additionally, base @6b9593946 was missing an updated callsite for `can_recv()`. --- Cargo.lock | 4 ++-- netstack/src/scheme/udp.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a282a46c11..49b26b9965 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -903,7 +903,7 @@ dependencies = [ [[package]] name = "generic-rt" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#99e8cd93e0d125010130d8e3aee7d343735d8b5c" +source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#b17df4daf5e72838d1afb2be83564e527adfe910" [[package]] name = "getrandom" @@ -1804,7 +1804,7 @@ checksum = "436d45c2b6a5b159d43da708e62b25be3a4a3d5550d654b72216ade4c4bfd717" [[package]] name = "redox-rt" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#99e8cd93e0d125010130d8e3aee7d343735d8b5c" +source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#b17df4daf5e72838d1afb2be83564e527adfe910" dependencies = [ "bitflags 2.10.0", "generic-rt", diff --git a/netstack/src/scheme/udp.rs b/netstack/src/scheme/udp.rs index 2ad0bb771e..59037c2a02 100644 --- a/netstack/src/scheme/udp.rs +++ b/netstack/src/scheme/udp.rs @@ -209,7 +209,7 @@ impl<'a> SchemeSocket for UdpSocket<'a> { ) -> SyscallResult { if !file.read_enabled { Ok(0) - } else if self.can_recv() { + } else if self.can_recv(&file.data) { let (length, _) = self.recv_slice(buf).expect("Can't receive slice"); Ok(length) } else if file.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK {