From cfcc12eee3a31d9dbae480ef2272b31264f75d79 Mon Sep 17 00:00:00 2001 From: tunnell <2406627+tunnell@users.noreply.github.com> Date: Sat, 9 May 2026 19:48:20 +0200 Subject: [PATCH] fix(net): write NetError code at byte 1 too, so std-side recv decodes correctly Mirror the error code at byte 1 (in addition to byte 4) in respond_with_error. The std-side Xous net backend's send path reads byte 4 (correct vs. the historical [1,1,1,1,code,0,0,0] layout), but the recv paths read byte 1 (which is always 1 under the old layout, so ErrorKind::TimedOut and WouldBlock were unreachable from the recv side). With this change both decoders see the right value; existing byte-4 readers are unaffected; the "buf as u32-LE != 0" error marker still holds because byte 0 stays 1. Companion PR to rust-lang/rust will fix the std side to read byte 4 and match the send path. This kernel-side mirror is the shippable workaround until that lands and works with any Rust-toolchain version. --- services/net/src/std_glue.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/services/net/src/std_glue.rs b/services/net/src/std_glue.rs index f1f6fed59..9fed85d7f 100644 --- a/services/net/src/std_glue.rs +++ b/services/net/src/std_glue.rs @@ -54,15 +54,19 @@ pub(crate) fn respond_with_error(mut env: xous::MessageEnvelope, code: NetError) body.valid = None; let s: &mut [u8] = unsafe { body.buf.as_slice_mut() }; let mut i = s.iter_mut(); + let code = code as u8; // Duplicate error to ensure it's seen as an error regardless of byte order/return type // This is necessary because errors are encoded as `u8` slices, but "good" // responses may be encoded as `u16` or `u32` slices. + // + // Mirror code at byte 1 (where the std-side recv path reads) in + // addition to byte 4 (where the std-side send path reads). + *i.next()? = 1; + *i.next()? = code; *i.next()? = 1; *i.next()? = 1; - *i.next()? = 1; - *i.next()? = 1; - *i.next()? = code as u8; + *i.next()? = code; *i.next()? = 0; *i.next()? = 0; *i.next()? = 0;