From e00b9583084df651dc4c06d9199d6a73a29378dd Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Wed, 10 Mar 2021 17:35:57 +0800 Subject: [PATCH] hosted: transmit PID to clients Prior to this patch, all clients assumed they were PID 1. Signed-off-by: Sean Cross --- kernel/src/arch/hosted/process.rs | 3 ++- xous-rs/src/arch/hosted.rs | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/src/arch/hosted/process.rs b/kernel/src/arch/hosted/process.rs index cb23fb8cc..d2ba45a15 100644 --- a/kernel/src/arch/hosted/process.rs +++ b/kernel/src/arch/hosted/process.rs @@ -91,7 +91,7 @@ pub fn set_current_pid(pid: PID) { } pub fn register_connection_for_key( - conn: TcpStream, + mut conn: TcpStream, key: ProcessKey, ) -> Result { PROCESS_TABLE.with(|pt| { @@ -99,6 +99,7 @@ pub fn register_connection_for_key( for (pid_minus_1, process) in process_table.table.iter_mut().enumerate() { if let Some(process) = process.as_mut() { if process.key == key && process.conn.is_none() { + conn.write_all(&[pid_minus_1 as u8 + 1]).unwrap(); process.conn = Some(conn); return Ok(PID::new(pid_minus_1 as u8 + 1).unwrap()); } diff --git a/xous-rs/src/arch/hosted.rs b/xous-rs/src/arch/hosted.rs index 992ae2663..1bc7cfcaa 100644 --- a/xous-rs/src/arch/hosted.rs +++ b/xous-rs/src/arch/hosted.rs @@ -397,6 +397,9 @@ fn xous_connect_impl( Ok(mut conn) => { conn.write_all(&key.0).unwrap(); // Send key to authenticate us as PID 1 conn.flush().unwrap(); + let mut pid = [0u8]; + conn.read_exact(&mut pid).unwrap(); + PROCESS_ID.with(|process_id| *process_id.borrow_mut() = PID::new(pid[0]).unwrap()); Ok(ServerConnection { send: Arc::new(Mutex::new(conn.try_clone().unwrap())), recv: Arc::new(Mutex::new(conn)),