allow multiple listeners in gen2 targets

this simplifies a bunch of stuff when we can trust the internal
code base
This commit is contained in:
bunnie 2025-05-06 01:48:37 +08:00
parent 30fcc3016f
commit 095939ee53
2 changed files with 10 additions and 18 deletions

View file

@ -39,8 +39,7 @@ fn keyboard_service() {
let xns = xous_names::XousNames::new().unwrap(); let xns = xous_names::XousNames::new().unwrap();
let kbd_sid = xns.register_name(cramium_api::SERVER_NAME_KBD, None).expect("can't register server"); let kbd_sid = xns.register_name(cramium_api::SERVER_NAME_KBD, None).expect("can't register server");
let mut listener_conn: Option<CID> = None; let mut listeners: Vec<(CID, usize)> = Vec::new();
let mut listener_op: Option<usize> = None;
let mut observer_conn: Option<CID> = None; let mut observer_conn: Option<CID> = None;
let mut observer_op: Option<usize> = None; let mut observer_op: Option<usize> = None;
@ -62,13 +61,10 @@ fn keyboard_service() {
let kr = buffer.as_flat::<KeyboardRegistration, _>().unwrap(); let kr = buffer.as_flat::<KeyboardRegistration, _>().unwrap();
match xns.request_connection_blocking(kr.server_name.as_str()) { match xns.request_connection_blocking(kr.server_name.as_str()) {
Ok(cid) => { Ok(cid) => {
listener_conn = Some(cid); listeners.push((cid, <u32 as From<u32>>::from(kr.listener_op_id.into()) as usize));
listener_op = Some(<u32 as From<u32>>::from(kr.listener_op_id.into()) as usize);
} }
Err(e) => { Err(e) => {
log::error!("couldn't connect to listener: {:?}", e); log::error!("couldn't connect to listener: {:?}", e);
listener_conn = None;
listener_op = None;
} }
} }
} }
@ -152,16 +148,16 @@ fn keyboard_service() {
} }
}; };
if let Some(conn) = listener_conn { for &(conn, listener_op) in listeners.iter() {
if key != '\u{0000}' { if key != '\u{0000}' {
if key >= '\u{f700}' && key <= '\u{f8ff}' { if key >= '\u{f700}' && key <= '\u{f8ff}' {
log::info!("ignoring key '{}'({:x})", key, key as u32); // ignore Apple PUA characters log::info!("ignoring key '{}'({:x})", key, key as u32); // ignore Apple PUA characters
} else { } else {
log::debug!("injecting key '{}'({:x})", key, key as u32); // always be noisy about this, it's an exploit path log::debug!("injecting key '{}'({:x}) to {}", key, key as u32, conn); // always be noisy about this, it's an exploit path
xous::try_send_message( xous::try_send_message(
conn, conn,
xous::Message::new_scalar( xous::Message::new_scalar(
listener_op.unwrap(), listener_op,
key as u32 as usize, key as u32 as usize,
'\u{0000}' as u32 as usize, '\u{0000}' as u32 as usize,
'\u{0000}' as u32 as usize, '\u{0000}' as u32 as usize,

View file

@ -38,8 +38,7 @@ fn keyboard_service() {
let xns = xous_names::XousNames::new().unwrap(); let xns = xous_names::XousNames::new().unwrap();
let kbd_sid = xns.register_name(cramium_api::SERVER_NAME_KBD, None).expect("can't register server"); let kbd_sid = xns.register_name(cramium_api::SERVER_NAME_KBD, None).expect("can't register server");
let mut listener_conn: Option<CID> = None; let mut listeners: Vec<(CID, usize)> = Vec::new();
let mut listener_op: Option<usize> = None;
let mut observer_conn: Option<CID> = None; let mut observer_conn: Option<CID> = None;
let mut observer_op: Option<usize> = None; let mut observer_op: Option<usize> = None;
@ -61,13 +60,10 @@ fn keyboard_service() {
let kr = buffer.as_flat::<KeyboardRegistration, _>().unwrap(); let kr = buffer.as_flat::<KeyboardRegistration, _>().unwrap();
match xns.request_connection_blocking(kr.server_name.as_str()) { match xns.request_connection_blocking(kr.server_name.as_str()) {
Ok(cid) => { Ok(cid) => {
listener_conn = Some(cid); listeners.push((cid, <u32 as From<u32>>::from(kr.listener_op_id.into()) as usize));
listener_op = Some(<u32 as From<u32>>::from(kr.listener_op_id.into()) as usize);
} }
Err(e) => { Err(e) => {
log::error!("couldn't connect to listener: {:?}", e); log::error!("couldn't connect to listener: {:?}", e);
listener_conn = None;
listener_op = None;
} }
} }
} }
@ -151,16 +147,16 @@ fn keyboard_service() {
} }
}; };
if let Some(conn) = listener_conn { for &(conn, listener_op) in listeners.iter() {
if key != '\u{0000}' { if key != '\u{0000}' {
if key >= '\u{f700}' && key <= '\u{f8ff}' { if key >= '\u{f700}' && key <= '\u{f8ff}' {
log::info!("ignoring key '{}'({:x})", key, key as u32); // ignore Apple PUA characters log::info!("ignoring key '{}'({:x})", key, key as u32); // ignore Apple PUA characters
} else { } else {
log::debug!("injecting key '{}'({:x})", key, key as u32); // always be noisy about this, it's an exploit path log::debug!("injecting key '{}'({:x}) to {}", key, key as u32, conn); // always be noisy about this, it's an exploit path
xous::try_send_message( xous::try_send_message(
conn, conn,
xous::Message::new_scalar( xous::Message::new_scalar(
listener_op.unwrap(), listener_op,
key as u32 as usize, key as u32 as usize,
'\u{0000}' as u32 as usize, '\u{0000}' as u32 as usize,
'\u{0000}' as u32 as usize, '\u{0000}' as u32 as usize,