From e8bdf91cc3135c526d1749f06acd3ed9c26f64f3 Mon Sep 17 00:00:00 2001 From: Sam Blenny <68084116+samblenny@users.noreply.github.com> Date: Tue, 6 Jul 2021 02:14:25 +0000 Subject: [PATCH 01/11] add wlan shell command This is for turning the WF200 wifi radio on and off, setting the SSID and password, joining an AP, leaving an AP, and checking the AP connection status. Signed-off-by: samblenny --- services/shellchat/src/cmds.rs | 3 + services/shellchat/src/cmds/wlan.rs | 95 +++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 services/shellchat/src/cmds/wlan.rs diff --git a/services/shellchat/src/cmds.rs b/services/shellchat/src/cmds.rs index 5bca20bc6..59a85d3c1 100644 --- a/services/shellchat/src/cmds.rs +++ b/services/shellchat/src/cmds.rs @@ -97,6 +97,7 @@ mod engine; use engine::*; mod console; use console::*; mod memtest; use memtest::*; mod keys; use keys::*; +mod wlan; use wlan::*; //mod fcc; use fcc::*; //mod pds; // dependency of the FCC file @@ -181,6 +182,7 @@ impl CmdEnv { let mut ret = String::<1024>::new(); let mut echo_cmd = Echo {}; // this command has no persistent storage, so we can "create" it every time we call dispatch (but it's a zero-cost absraction so this doesn't actually create any instructions) + let mut wlan_cmd = Wlan {}; let mut ver_cmd = Ver{}; let mut backlight_cmd = Backlight{}; let mut accel_cmd = Accel{}; @@ -207,6 +209,7 @@ impl CmdEnv { &mut console_cmd, &mut self.memtest_cmd, &mut self.keys_cmd, + &mut wlan_cmd, //&mut self.fcc_cmd, ]; diff --git a/services/shellchat/src/cmds/wlan.rs b/services/shellchat/src/cmds/wlan.rs new file mode 100644 index 000000000..68a3a7876 --- /dev/null +++ b/services/shellchat/src/cmds/wlan.rs @@ -0,0 +1,95 @@ +use crate::{CommonEnv, ShellCmdApi}; +use core::fmt::Write; +use xous_ipc::String; + +#[derive(Debug)] +pub struct Wlan {} + +/** +wlan shell command: +- on: if in off mode, reset WF200 and load firmware, otherwise NOP +- off: disconnect from AP (if joined) and put WF200 in low power standby +- setssid ...: set AP SSID to ... (... can include spaces) +- setpass ...: set AP password to ... (... can include spaces) +- join: if disconnected, connect by WPA2 personal with previously set SSID + and password, otherwise NOP +- leave: if joined, disconnect from AP +- show: show AP connection info (SSID, signal strength) +*/ +impl<'a> ShellCmdApi<'a> for Wlan { + cmd_api!(wlan); // inserts boilerplate for command API + + fn process( + &mut self, + args: String<1024>, + _env: &mut CommonEnv, + ) -> Result>, xous::Error> { + let mut ret = String::<1024>::new(); + let helpstring = "wlan [on] [off] [setssid ...] [setpass ...] [join] [leave] [show]"; + let mut show_help = false; + + let mut tokens = args.as_str().unwrap().split(' '); + if let Some(sub_cmd) = tokens.next() { + match sub_cmd { + "on" => { + //env.com.set_wlan_on().unwrap(); + write!(ret, "wlan on").unwrap(); + } + "off" => { + //env.com.set_wlan_off().unwrap(); + write!(ret, "wlan off").unwrap(); + } + "setssid" => { + let mut val = String::<1024>::new(); + join_tokens(&mut val, &mut tokens); + //env.com.set_wlan_ssid(&val).unwrap(); + write!(ret, "wlan setssid {}", val).unwrap(); + } + "setpass" => { + let mut val = String::<1024>::new(); + join_tokens(&mut val, &mut tokens); + //env.com.set_wlan_pass(&val).unwrap(); + write!(ret, "wlan setpass {}", val).unwrap(); + } + "join" => { + //env.com.wlan_join().unwrap(); + write!(ret, "wlan join").unwrap(); + } + "leave" => { + //env.com.wlan_leave().unwrap(); + write!(ret, "wlan leave").unwrap(); + } + "show" => { + //env.com.wlan_show().unwrap(); + write!(ret, "wlan show").unwrap(); + } + _ => { + show_help = true; + } + } + } else { + show_help = true; + } + if show_help { + write!(ret, "{}", helpstring).unwrap(); + } + Ok(Some(ret)) + } +} + +/** +Join an iterator of string tokens with spaces. + +This is intended to reverse the effect of .split(' ') in the context of a very simple +command parser. This is a lazy way to avoid building a parser for quoted strings, since +SSIDs or passwords might include spaces. +*/ +fn join_tokens<'a>(buf: &mut String<1024>, tokens: impl Iterator) { + for (i, tok) in tokens.enumerate() { + if i == 0 { + write!(buf, "{}", tok).unwrap(); + } else { + write!(buf, " {}", tok).unwrap(); + } + } +} From 2bbb8d05b946d1fc531bf16a7db38a02f0fb41ba Mon Sep 17 00:00:00 2001 From: Sam Blenny <68084116+samblenny@users.noreply.github.com> Date: Tue, 6 Jul 2021 05:31:32 +0000 Subject: [PATCH 02/11] add ip shellchat command This is for testing out the IP stack: list dhcp info, send pings, send UDP message, and receive UDP message. Signed-off-by: samblenny --- services/shellchat/src/cmds.rs | 3 ++ services/shellchat/src/cmds/ip.rs | 90 +++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 services/shellchat/src/cmds/ip.rs diff --git a/services/shellchat/src/cmds.rs b/services/shellchat/src/cmds.rs index 59a85d3c1..43aded60f 100644 --- a/services/shellchat/src/cmds.rs +++ b/services/shellchat/src/cmds.rs @@ -98,6 +98,7 @@ mod console; use console::*; mod memtest; use memtest::*; mod keys; use keys::*; mod wlan; use wlan::*; +mod ip; use ip::*; //mod fcc; use fcc::*; //mod pds; // dependency of the FCC file @@ -183,6 +184,7 @@ impl CmdEnv { let mut echo_cmd = Echo {}; // this command has no persistent storage, so we can "create" it every time we call dispatch (but it's a zero-cost absraction so this doesn't actually create any instructions) let mut wlan_cmd = Wlan {}; + let mut ip_cmd = Ip {}; let mut ver_cmd = Ver{}; let mut backlight_cmd = Backlight{}; let mut accel_cmd = Accel{}; @@ -210,6 +212,7 @@ impl CmdEnv { &mut self.memtest_cmd, &mut self.keys_cmd, &mut wlan_cmd, + &mut ip_cmd, //&mut self.fcc_cmd, ]; diff --git a/services/shellchat/src/cmds/ip.rs b/services/shellchat/src/cmds/ip.rs new file mode 100644 index 000000000..67976f09d --- /dev/null +++ b/services/shellchat/src/cmds/ip.rs @@ -0,0 +1,90 @@ +use crate::{CommonEnv, ShellCmdApi}; +use core::fmt::Write; +use xous_ipc::String; + +#[derive(Debug)] +pub struct Ip {} + +/** +ip shell command: +- list: show ip address, netmask, gateway, dns server, etc. +- ping host: send 3 ICMP pings to host (ip/hostname) +- udptx host port ...: send a UDP packet with string ... to host:port +- udprx: listen on udp localhost:port and echo payload of first incoming + packet (5s timeout) +*/ +impl<'a> ShellCmdApi<'a> for Ip { + cmd_api!(ip); // inserts boilerplate for command API + + fn process( + &mut self, + args: String<1024>, + _env: &mut CommonEnv, + ) -> Result>, xous::Error> { + let mut ret = String::<1024>::new(); + let helpstring = "ip [list] [ping host] [udptx host port ...] [udprx port]"; + let mut show_help = false; + + let mut tokens = args.as_str().unwrap().split(' '); + if let Some(sub_cmd) = tokens.next() { + match sub_cmd { + "list" => { + //env.com.ip_list().unwrap(); + write!(ret, "ip list").unwrap(); + } + "ping" => { + if let Some(host) = tokens.next() { + //env.com.ip_ping(&host).unwrap(); + write!(ret, "ip ping {}", host).unwrap(); + } else { + show_help = true; + } + } + "udptx" => { + if let (Some(host), Some(port)) = (tokens.next(), tokens.next()) { + let mut val = String::<1024>::new(); + join_tokens(&mut val, &mut tokens); + //env.com.ip_udptx(&host, &port, &val).unwrap(); + write!(ret, "ip udptx {} {} {}", host, port, val).unwrap(); + } else { + show_help = true; + } + } + "udprx" => { + if let Some(port) = tokens.next() { + //env.com.ip_updprx(&port).unwrap(); + write!(ret, "ip udprx {}", port).unwrap(); + } else { + show_help = true; + } + } + _ => { + show_help = true; + } + } + } else { + show_help = true; + } + if show_help { + write!(ret, "{}", helpstring).unwrap(); + } + Ok(Some(ret)) + } +} + +/** +Join an iterator of string tokens with spaces. + +This is intended to reverse the effect of .split(' ') in the context of a very simple +command parser. This is a lazy way to avoid building a parser for quoted strings, since +SSIDs or passwords might include spaces. +*/ +fn join_tokens<'a>(buf: &mut String<1024>, tokens: impl Iterator) { + for (i, tok) in tokens.enumerate() { + if i == 0 { + write!(buf, "{}", tok).unwrap(); + } else { + write!(buf, " {}", tok).unwrap(); + } + } +} From 03ad8bd2e4fed39f316cc851c6dbbddba1d33891 Mon Sep 17 00:00:00 2001 From: Sam Blenny <68084116+samblenny@users.noreply.github.com> Date: Tue, 6 Jul 2021 08:29:58 +0000 Subject: [PATCH 03/11] add support for wlan commands to com server Signed-off-by: samblenny --- services/com/src/api.rs | 21 ++++++++++ services/com/src/lib.rs | 64 +++++++++++++++++++++++++++++ services/com/src/main.rs | 31 ++++++++++++++ services/shellchat/src/cmds/wlan.rs | 24 ++++++----- 4 files changed, 130 insertions(+), 10 deletions(-) diff --git a/services/com/src/api.rs b/services/com/src/api.rs index b5ea4318f..0b0adf06a 100644 --- a/services/com/src/api.rs +++ b/services/com/src/api.rs @@ -136,6 +136,27 @@ pub(crate) enum Opcode { /// suspend/resume callback SuspendResume, + + /// wlan: make sure radio is on (reset from standby if needed) + WlanOn, + + /// wlan: switch radio to lowest power standby mode + WlanOff, + + /// wlan: set SSID to use for joining AP + WlanSetSSID, + + /// wlan: set password to use for joining AP + WlanSetPass, + + /// wlan: join AP using previously set SSID & password + WlanJoin, + + /// wlan: disconnect from AP + WlanLeave, + + /// wlan: get AP connection info (SSID, BSSID, signal strength) + WlanShow, } /// These enums indicate what kind of callback type we're sending. diff --git a/services/com/src/lib.rs b/services/com/src/lib.rs index e8cd9f105..c0a27061e 100644 --- a/services/com/src/lib.rs +++ b/services/com/src/lib.rs @@ -301,6 +301,70 @@ impl Com { } } } + + pub fn wlan_set_on(&mut self) -> Result { + send_message( + self.conn, + Message::new_scalar(Opcode::WlanOn.to_usize().unwrap(), 0, 0, 0, 0), + ) + } + + pub fn wlan_set_off(&mut self) -> Result { + send_message( + self.conn, + Message::new_scalar(Opcode::WlanOff.to_usize().unwrap(), 0, 0, 0, 0), + ) + } + + pub fn wlan_set_ssid(&mut self, s: &String<1024>) -> Result { + use core::fmt::Write; + // Enforce WPA2 length limit before passing strings on to WF200 + const WPA2_SSID_MAX_LEN: usize = 32; + if s.len() > WPA2_SSID_MAX_LEN { + return Err(xous::Error::InvalidString); + } + let mut copy: String:: = String::new(); + let _ = write!(copy, "{}", s); + let buf = Buffer::into_buf(copy).or(Err(xous::Error::InternalError))?; + buf.lend(self.conn, Opcode::WlanSetSSID.to_u32().unwrap()) + } + + pub fn wlan_set_pass(&mut self, s: &String<1024>) -> Result { + use core::fmt::Write; + // Enforce WPA2 length limit before passing strings on to WF200 + const WPA2_PASS_MAX_LEN: usize = 63; + if s.len() > WPA2_PASS_MAX_LEN { + return Err(xous::Error::InvalidString); + } + let mut copy: String:: = String::new(); + let _ = write!(copy, "{}", s); + let buf = Buffer::into_buf(copy).or(Err(xous::Error::InternalError))?; + buf.lend(self.conn, Opcode::WlanSetPass.to_u32().unwrap()) + } + + pub fn wlan_join(&mut self) -> Result { + // TODO: how to make this return success/fail status from WF200? + send_message( + self.conn, + Message::new_scalar(Opcode::WlanJoin.to_usize().unwrap(), 0, 0, 0, 0), + ) + } + + pub fn wlan_leave(&mut self) -> Result { + send_message( + self.conn, + Message::new_scalar(Opcode::WlanJoin.to_usize().unwrap(), 0, 0, 0, 0), + ) + } + + pub fn wlan_show(&mut self) -> Result { + // TODO: how to make this return IP, netmask, gateway, DNS server, and STA MAC? + send_message( + self.conn, + Message::new_scalar(Opcode::WlanShow.to_usize().unwrap(), 0, 0, 0, 0), + ) + } + } use core::sync::atomic::{AtomicU32, Ordering}; diff --git a/services/com/src/main.rs b/services/com/src/main.rs index 7be531088..f853cf5e9 100644 --- a/services/com/src/main.rs +++ b/services/com/src/main.rs @@ -583,6 +583,37 @@ fn xmain() -> ! { } buffer.replace(ssid_str).unwrap(); } + Some(Opcode::WlanOn) => { + info!("TODO: implement WlanOn"); + // com.txrx(ComState::WLAN_ON.verb); + } + Some(Opcode::WlanOff) => { + info!("TODO: implement WlanOff"); + // com.txrx(ComState::WLAN_OFF.verb); + } + Some(Opcode::WlanSetSSID) => { + info!("TODO: implement WlanSetSSID"); + // com.txrx(ComState::WLAN_SET_SSID.verb); + // ... (?) + } + Some(Opcode::WlanSetPass) => { + info!("TODO: implement WlanSetPass"); + // com.txrx(ComState::WLAN_SET_PASS.verb); + // ... (?) + } + Some(Opcode::WlanJoin) => { + info!("TODO: implement WlanJoin"); + // com.txrx(ComState::WLAN_JOIN.verb); + } + Some(Opcode::WlanLeave) => { + info!("TODO: implement WlanLeave"); + // com.txrx(ComState::WLAN_LEAVE.verb); + } + Some(Opcode::WlanShow) => { + info!("TODO: implement WlanShow"); + // com.txrx(ComState::WLAN_SHOW.verb); + // ... (?) + } None => {error!("unknown opcode"); break}, } diff --git a/services/shellchat/src/cmds/wlan.rs b/services/shellchat/src/cmds/wlan.rs index 68a3a7876..0d3792f14 100644 --- a/services/shellchat/src/cmds/wlan.rs +++ b/services/shellchat/src/cmds/wlan.rs @@ -22,7 +22,7 @@ impl<'a> ShellCmdApi<'a> for Wlan { fn process( &mut self, args: String<1024>, - _env: &mut CommonEnv, + env: &mut CommonEnv, ) -> Result>, xous::Error> { let mut ret = String::<1024>::new(); let helpstring = "wlan [on] [off] [setssid ...] [setpass ...] [join] [leave] [show]"; @@ -32,35 +32,39 @@ impl<'a> ShellCmdApi<'a> for Wlan { if let Some(sub_cmd) = tokens.next() { match sub_cmd { "on" => { - //env.com.set_wlan_on().unwrap(); + env.com.wlan_set_on().unwrap(); write!(ret, "wlan on").unwrap(); } "off" => { - //env.com.set_wlan_off().unwrap(); + env.com.wlan_set_off().unwrap(); write!(ret, "wlan off").unwrap(); } "setssid" => { let mut val = String::<1024>::new(); join_tokens(&mut val, &mut tokens); - //env.com.set_wlan_ssid(&val).unwrap(); - write!(ret, "wlan setssid {}", val).unwrap(); + let _ = match env.com.wlan_set_ssid(&val) { + Ok(_) => write!(ret, "wlan setssid {}", val), + Err(_) => write!(ret, "Error: ssid max len is 32"), + }; } "setpass" => { let mut val = String::<1024>::new(); join_tokens(&mut val, &mut tokens); - //env.com.set_wlan_pass(&val).unwrap(); - write!(ret, "wlan setpass {}", val).unwrap(); + let _ = match env.com.wlan_set_pass(&val) { + Ok(_) => write!(ret, "wlan setpass {}", val), + Err(_) => write!(ret, "Error: pass max len is 63"), + }; } "join" => { - //env.com.wlan_join().unwrap(); + env.com.wlan_join().unwrap(); write!(ret, "wlan join").unwrap(); } "leave" => { - //env.com.wlan_leave().unwrap(); + env.com.wlan_leave().unwrap(); write!(ret, "wlan leave").unwrap(); } "show" => { - //env.com.wlan_show().unwrap(); + env.com.wlan_show().unwrap(); write!(ret, "wlan show").unwrap(); } _ => { From 803f6d496ff503a101e68e9e9d0005609fd0ef2d Mon Sep 17 00:00:00 2001 From: Sam Blenny <68084116+samblenny@users.noreply.github.com> Date: Wed, 7 Jul 2021 03:34:30 +0000 Subject: [PATCH 04/11] fix passphrase length limit to match WF200 API Signed-off-by: samblenny --- services/com/src/lib.rs | 16 ++++++++-------- services/shellchat/src/cmds/wlan.rs | 14 +++++++++----- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/services/com/src/lib.rs b/services/com/src/lib.rs index c0a27061e..da8022d11 100644 --- a/services/com/src/lib.rs +++ b/services/com/src/lib.rs @@ -318,12 +318,12 @@ impl Com { pub fn wlan_set_ssid(&mut self, s: &String<1024>) -> Result { use core::fmt::Write; - // Enforce WPA2 length limit before passing strings on to WF200 - const WPA2_SSID_MAX_LEN: usize = 32; - if s.len() > WPA2_SSID_MAX_LEN { + // Enforce WF200 driver API length limit + const WF200_SSID_MAX_LEN: usize = 32; + if s.len() > WF200_SSID_MAX_LEN { return Err(xous::Error::InvalidString); } - let mut copy: String:: = String::new(); + let mut copy: String:: = String::new(); let _ = write!(copy, "{}", s); let buf = Buffer::into_buf(copy).or(Err(xous::Error::InternalError))?; buf.lend(self.conn, Opcode::WlanSetSSID.to_u32().unwrap()) @@ -331,12 +331,12 @@ impl Com { pub fn wlan_set_pass(&mut self, s: &String<1024>) -> Result { use core::fmt::Write; - // Enforce WPA2 length limit before passing strings on to WF200 - const WPA2_PASS_MAX_LEN: usize = 63; - if s.len() > WPA2_PASS_MAX_LEN { + // Enforce WF200 driver API length limit + const WF200_PASS_MAX_LEN: usize = 64; + if s.len() > WF200_PASS_MAX_LEN { return Err(xous::Error::InvalidString); } - let mut copy: String:: = String::new(); + let mut copy: String:: = String::new(); let _ = write!(copy, "{}", s); let buf = Buffer::into_buf(copy).or(Err(xous::Error::InternalError))?; buf.lend(self.conn, Opcode::WlanSetPass.to_u32().unwrap()) diff --git a/services/shellchat/src/cmds/wlan.rs b/services/shellchat/src/cmds/wlan.rs index 0d3792f14..d1035aa4a 100644 --- a/services/shellchat/src/cmds/wlan.rs +++ b/services/shellchat/src/cmds/wlan.rs @@ -42,17 +42,21 @@ impl<'a> ShellCmdApi<'a> for Wlan { "setssid" => { let mut val = String::<1024>::new(); join_tokens(&mut val, &mut tokens); - let _ = match env.com.wlan_set_ssid(&val) { - Ok(_) => write!(ret, "wlan setssid {}", val), - Err(_) => write!(ret, "Error: ssid max len is 32"), - }; + if val.len() == 0 { + let _ = write!(ret, "Error: SSID too short"); + } else { + let _ = match env.com.wlan_set_ssid(&val) { + Ok(_) => write!(ret, "wlan setssid {}", val), + Err(_) => write!(ret, "Error: SSID too long for WPA2"), + }; + } } "setpass" => { let mut val = String::<1024>::new(); join_tokens(&mut val, &mut tokens); let _ = match env.com.wlan_set_pass(&val) { Ok(_) => write!(ret, "wlan setpass {}", val), - Err(_) => write!(ret, "Error: pass max len is 63"), + Err(_) => write!(ret, "Error: passphrase too long for WPA2"), }; } "join" => { From 5bf1a34eb76bc997b9702f2f30305171860131ce Mon Sep 17 00:00:00 2001 From: Sam Blenny <68084116+samblenny@users.noreply.github.com> Date: Wed, 7 Jul 2021 08:40:14 +0000 Subject: [PATCH 05/11] temporarily change com_rs-ref; TODO: UPDATE HASH Signed-off-by: samblenny --- imports/com_rs-ref/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imports/com_rs-ref/Cargo.toml b/imports/com_rs-ref/Cargo.toml index e8bf80019..bda166513 100644 --- a/imports/com_rs-ref/Cargo.toml +++ b/imports/com_rs-ref/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" description = "com_rs import package" [dependencies] -com_rs = { git = "https://github.com/betrusted-io/com_rs.git", rev = "4b45a42ad2d932550566d6c32ec1e1dd60e93c67" } -#com_rs = { path = "../../../betrusted-ec/sw/com_rs" } +#com_rs = { git = "https://github.com/betrusted-io/com_rs.git", rev = "4b45a42ad2d932550566d6c32ec1e1dd60e93c67" } +com_rs = { path = "../../../betrusted-ec/sw/com_rs" } # targeting hardware From 5c93365acd3fca313493df0b934a139c34d74a5f Mon Sep 17 00:00:00 2001 From: Sam Blenny <68084116+samblenny@users.noreply.github.com> Date: Wed, 7 Jul 2021 08:43:20 +0000 Subject: [PATCH 06/11] implement COM bus txrx for wlan commands Signed-off-by: samblenny --- services/com/src/api.rs | 4 +- services/com/src/lib.rs | 12 +++-- services/com/src/main.rs | 81 ++++++++++++++++++++++++----- services/shellchat/src/cmds/wlan.rs | 42 +++++++++------ 4 files changed, 102 insertions(+), 37 deletions(-) diff --git a/services/com/src/api.rs b/services/com/src/api.rs index 0b0adf06a..210cffe31 100644 --- a/services/com/src/api.rs +++ b/services/com/src/api.rs @@ -155,8 +155,8 @@ pub(crate) enum Opcode { /// wlan: disconnect from AP WlanLeave, - /// wlan: get AP connection info (SSID, BSSID, signal strength) - WlanShow, + /// wlan: get wlan radio status (power state? connected? AP info?) + WlanStatus, } /// These enums indicate what kind of callback type we're sending. diff --git a/services/com/src/lib.rs b/services/com/src/lib.rs index da8022d11..57b698f38 100644 --- a/services/com/src/lib.rs +++ b/services/com/src/lib.rs @@ -357,12 +357,14 @@ impl Com { ) } - pub fn wlan_show(&mut self) -> Result { + pub fn wlan_status(&mut self) -> Result, xous::Error> { // TODO: how to make this return IP, netmask, gateway, DNS server, and STA MAC? - send_message( - self.conn, - Message::new_scalar(Opcode::WlanShow.to_usize().unwrap(), 0, 0, 0, 0), - ) + const STATUS_MAX_LEN: usize = 160; + let status = xous_ipc::String::::new(); + let mut buf = Buffer::into_buf(status).or(Err(xous::Error::InternalError))?; + buf.lend_mut(self.conn, Opcode::WlanStatus.to_u32().unwrap()).or(Err(xous::Error::InternalError))?; + let response = buf.to_original::, _>().unwrap(); + Ok(response) } } diff --git a/services/com/src/main.rs b/services/com/src/main.rs index f853cf5e9..14f91a14a 100644 --- a/services/com/src/main.rs +++ b/services/com/src/main.rs @@ -585,34 +585,87 @@ fn xmain() -> ! { } Some(Opcode::WlanOn) => { info!("TODO: implement WlanOn"); - // com.txrx(ComState::WLAN_ON.verb); + com.txrx(ComState::WLAN_ON.verb); } Some(Opcode::WlanOff) => { info!("TODO: implement WlanOff"); - // com.txrx(ComState::WLAN_OFF.verb); + com.txrx(ComState::WLAN_OFF.verb); } Some(Opcode::WlanSetSSID) => { - info!("TODO: implement WlanSetSSID"); - // com.txrx(ComState::WLAN_SET_SSID.verb); - // ... (?) + const WF200_SSID_LEN: usize = 32; + let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; + let ssid = buffer.to_original::, _>().unwrap(); + info!("WlanSetSSID: {}", ssid); + let ssid_bytes = ssid.as_bytes(); + let length = ssid.len(); + com.txrx(ComState::WLAN_SET_SSID.verb); + // Always send fixed size message of 1 length word + WF200_SSID_LEN/2 ssid words + com.txrx(length as u16); + for i in 0..WF200_SSID_LEN/2 { + let n = i * 2; + let word: u16 = match 0 { + _ if n + 1 < length => (ssid_bytes[n] as u16) | ((ssid_bytes[n + 1] as u16) << 8), + _ if n < length => ssid_bytes[n] as u16, + _ => 0 as u16, + }; + com.txrx(word); + } } Some(Opcode::WlanSetPass) => { - info!("TODO: implement WlanSetPass"); - // com.txrx(ComState::WLAN_SET_PASS.verb); - // ... (?) + const WF200_PASS_LEN: usize = 64; + let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; + let pass = buffer.to_original::, _>().unwrap(); + info!("WlanSetPass: {}", pass); + let pass_bytes = pass.as_bytes(); + let length = pass.len(); + com.txrx(ComState::WLAN_SET_PASS.verb); + // Always send fixed size message of 1 length word + WF200_PASS_LEN/2 ssid words + com.txrx(length as u16); + for i in 0..WF200_PASS_LEN/2 { + let n = i * 2; + let word: u16 = match 0 { + _ if n + 1 < length => (pass_bytes[n] as u16) | ((pass_bytes[n + 1] as u16) << 8), + _ if n < length => pass_bytes[n] as u16, + _ => 0 as u16, + }; + com.txrx(word); + } } Some(Opcode::WlanJoin) => { info!("TODO: implement WlanJoin"); - // com.txrx(ComState::WLAN_JOIN.verb); + com.txrx(ComState::WLAN_JOIN.verb); } Some(Opcode::WlanLeave) => { info!("TODO: implement WlanLeave"); - // com.txrx(ComState::WLAN_LEAVE.verb); + com.txrx(ComState::WLAN_LEAVE.verb); } - Some(Opcode::WlanShow) => { - info!("TODO: implement WlanShow"); - // com.txrx(ComState::WLAN_SHOW.verb); - // ... (?) + Some(Opcode::WlanStatus) => { + const STATUS_MAX_LEN: usize = 160; + const RX_WORD_LEN: usize = STATUS_MAX_LEN/2; + let mut buffer = unsafe { + Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) + }; + let mut rx: [u8; RX_WORD_LEN*2] = [0; RX_WORD_LEN*2]; + com.txrx(ComState::WLAN_STATUS.verb); + let size = com.wait_txrx(ComState::LINK_READ.verb, Some(STD_TIMEOUT)) as usize; + let size = if size > STATUS_MAX_LEN { STATUS_MAX_LEN } else { size as usize }; + for i in 0..RX_WORD_LEN { + let w = com.wait_txrx(ComState::LINK_READ.verb, Some(STD_TIMEOUT)) as u16; + let n = i * 2; + let (lsb, msb) = match 0 { + _ if n + 1 < size => ((w & 0xff) as u8, (w >> 8) as u8), + _ if n < size => ((w & 0xff) as u8, 0u8), + _ => (0u8, 0u8), + }; + rx[n] = lsb; + rx[n+1] = msb; + } + info!("size: {}", size); + info!("rx[0]: {}", rx[0] as u8); + let status = core::str::from_utf8(&rx[0..size]) + .unwrap_or("COM bus error:\nutf8 decode failed"); + let status_str = String::::from_str(&status); + let _ = buffer.replace(status_str); } None => {error!("unknown opcode"); break}, } diff --git a/services/shellchat/src/cmds/wlan.rs b/services/shellchat/src/cmds/wlan.rs index d1035aa4a..3ea702ce9 100644 --- a/services/shellchat/src/cmds/wlan.rs +++ b/services/shellchat/src/cmds/wlan.rs @@ -14,7 +14,7 @@ wlan shell command: - join: if disconnected, connect by WPA2 personal with previously set SSID and password, otherwise NOP - leave: if joined, disconnect from AP -- show: show AP connection info (SSID, signal strength) +- status: get wlan radio status (power state? connected? AP info?) */ impl<'a> ShellCmdApi<'a> for Wlan { cmd_api!(wlan); // inserts boilerplate for command API @@ -25,19 +25,23 @@ impl<'a> ShellCmdApi<'a> for Wlan { env: &mut CommonEnv, ) -> Result>, xous::Error> { let mut ret = String::<1024>::new(); - let helpstring = "wlan [on] [off] [setssid ...] [setpass ...] [join] [leave] [show]"; + let helpstring = "wlan [on] [off] [setssid ...] [setpass ...] [join] [leave] [status]"; let mut show_help = false; let mut tokens = args.as_str().unwrap().split(' '); if let Some(sub_cmd) = tokens.next() { match sub_cmd { "on" => { - env.com.wlan_set_on().unwrap(); - write!(ret, "wlan on").unwrap(); + let _ = match env.com.wlan_set_on() { + Ok(_) => write!(ret, "wlan on"), + Err(e) => write!(ret, "Error: {:?}", e), + }; } "off" => { - env.com.wlan_set_off().unwrap(); - write!(ret, "wlan off").unwrap(); + let _ = match env.com.wlan_set_off() { + Ok(_) => write!(ret, "wlan off"), + Err(e) => write!(ret, "Error: {:?}", e), + }; } "setssid" => { let mut val = String::<1024>::new(); @@ -47,7 +51,7 @@ impl<'a> ShellCmdApi<'a> for Wlan { } else { let _ = match env.com.wlan_set_ssid(&val) { Ok(_) => write!(ret, "wlan setssid {}", val), - Err(_) => write!(ret, "Error: SSID too long for WPA2"), + Err(_) => write!(ret, "Error: SSID too long for WF200"), }; } } @@ -56,20 +60,26 @@ impl<'a> ShellCmdApi<'a> for Wlan { join_tokens(&mut val, &mut tokens); let _ = match env.com.wlan_set_pass(&val) { Ok(_) => write!(ret, "wlan setpass {}", val), - Err(_) => write!(ret, "Error: passphrase too long for WPA2"), + Err(_) => write!(ret, "Error: passphrase too long for WF200"), }; } "join" => { - env.com.wlan_join().unwrap(); - write!(ret, "wlan join").unwrap(); + let _ = match env.com.wlan_join() { + Ok(_) => write!(ret, "wlan join"), + Err(e) => write!(ret, "Error: {:?}", e), + }; } "leave" => { - env.com.wlan_leave().unwrap(); - write!(ret, "wlan leave").unwrap(); + let _ = match env.com.wlan_leave() { + Ok(_) => write!(ret, "wlan leave"), + Err(e) => write!(ret, "Error: {:?}", e), + }; } - "show" => { - env.com.wlan_show().unwrap(); - write!(ret, "wlan show").unwrap(); + "status" => { + let _ = match env.com.wlan_status() { + Ok(msg) => write!(ret, "{}", msg), + Err(e) => write!(ret, "Error: {:?}", e), + }; } _ => { show_help = true; @@ -79,7 +89,7 @@ impl<'a> ShellCmdApi<'a> for Wlan { show_help = true; } if show_help { - write!(ret, "{}", helpstring).unwrap(); + let _ = write!(ret, "{}", helpstring); } Ok(Some(ret)) } From a614ccffb719d4f9e24d02f2e6cf70a3344440b5 Mon Sep 17 00:00:00 2001 From: Sam Blenny <68084116+samblenny@users.noreply.github.com> Date: Sat, 24 Jul 2021 02:51:32 +0000 Subject: [PATCH 07/11] Fix wlan_leave() to send correct verb wlan_leave() was mistakenly sending the verb for WLAN_JOIN. Signed-off-by: samblenny --- services/com/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/com/src/lib.rs b/services/com/src/lib.rs index 57b698f38..05ae89f4d 100644 --- a/services/com/src/lib.rs +++ b/services/com/src/lib.rs @@ -353,7 +353,7 @@ impl Com { pub fn wlan_leave(&mut self) -> Result { send_message( self.conn, - Message::new_scalar(Opcode::WlanJoin.to_usize().unwrap(), 0, 0, 0, 0), + Message::new_scalar(Opcode::WlanLeave.to_usize().unwrap(), 0, 0, 0, 0), ) } From ba4ca72703b38e92918926e9e506d3f76b41049f Mon Sep 17 00:00:00 2001 From: Sam Blenny <68084116+samblenny@users.noreply.github.com> Date: Tue, 3 Aug 2021 14:04:20 +0000 Subject: [PATCH 08/11] Use com_rs::serdes::StringSer for wlan ssid & pass Switch to using the new com_rs::serdes::StringSer struct for serializing the COM protocol arguments to WLAN_SET_SSID and WLAN_SET_PASS. The point is to reduce the amount of ad hoc, untested packing and unpacking. Signed-off-by: samblenny --- services/com/src/main.rs | 45 +++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/services/com/src/main.rs b/services/com/src/main.rs index 14f91a14a..e7cb03512 100644 --- a/services/com/src/main.rs +++ b/services/com/src/main.rs @@ -10,6 +10,7 @@ use log::{error, info, trace}; use com_rs_ref as com_rs; use com_rs::*; +use com_rs::serdes::{STR_32_WORDS, STR_64_WORDS, StringSer}; use xous::{CID, msg_scalar_unpack, msg_blocking_scalar_unpack}; use xous_ipc::{Buffer, String}; @@ -596,19 +597,15 @@ fn xmain() -> ! { let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; let ssid = buffer.to_original::, _>().unwrap(); info!("WlanSetSSID: {}", ssid); - let ssid_bytes = ssid.as_bytes(); - let length = ssid.len(); - com.txrx(ComState::WLAN_SET_SSID.verb); - // Always send fixed size message of 1 length word + WF200_SSID_LEN/2 ssid words - com.txrx(length as u16); - for i in 0..WF200_SSID_LEN/2 { - let n = i * 2; - let word: u16 = match 0 { - _ if n + 1 < length => (ssid_bytes[n] as u16) | ((ssid_bytes[n + 1] as u16) << 8), - _ if n < length => ssid_bytes[n] as u16, - _ => 0 as u16, - }; - com.txrx(word); + let mut str_ser = StringSer::::new(); + match str_ser.encode(&ssid.to_str()) { + Ok(tx_words) => { + com.txrx(ComState::WLAN_SET_SSID.verb); + for w in tx_words.iter() { + com.txrx(*w); + } + } + _ => info!("WlanSetSSID FAIL"), } } Some(Opcode::WlanSetPass) => { @@ -616,19 +613,15 @@ fn xmain() -> ! { let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; let pass = buffer.to_original::, _>().unwrap(); info!("WlanSetPass: {}", pass); - let pass_bytes = pass.as_bytes(); - let length = pass.len(); - com.txrx(ComState::WLAN_SET_PASS.verb); - // Always send fixed size message of 1 length word + WF200_PASS_LEN/2 ssid words - com.txrx(length as u16); - for i in 0..WF200_PASS_LEN/2 { - let n = i * 2; - let word: u16 = match 0 { - _ if n + 1 < length => (pass_bytes[n] as u16) | ((pass_bytes[n + 1] as u16) << 8), - _ if n < length => pass_bytes[n] as u16, - _ => 0 as u16, - }; - com.txrx(word); + let mut str_ser = StringSer::::new(); + match str_ser.encode(&pass.to_str()) { + Ok(tx_words) => { + com.txrx(ComState::WLAN_SET_PASS.verb); + for w in tx_words.iter() { + com.txrx(*w); + } + } + _ => info!("WlanSetPASS FAIL"), } } Some(Opcode::WlanJoin) => { From 53a0bf2827a4ace68e002a80d361521f494bc584 Mon Sep 17 00:00:00 2001 From: Sam Blenny <68084116+samblenny@users.noreply.github.com> Date: Fri, 6 Aug 2021 08:30:16 +0000 Subject: [PATCH 09/11] Use com_rs::serdes::StringDes for wlan status Switch to using the new com_rs::serdes::StringDes struct for deserializing the COM protocol response to WLAN_STATUS. With this change, `wlan status` will receive a string of up to 64 bytes and print it to the shellchat log. Status string formatting is handled by the betrusted-ec EC firmware code. Signed-off-by: samblenny --- services/com/src/main.rs | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/services/com/src/main.rs b/services/com/src/main.rs index e7cb03512..d31682d38 100644 --- a/services/com/src/main.rs +++ b/services/com/src/main.rs @@ -10,7 +10,7 @@ use log::{error, info, trace}; use com_rs_ref as com_rs; use com_rs::*; -use com_rs::serdes::{STR_32_WORDS, STR_64_WORDS, StringSer}; +use com_rs::serdes::{STR_32_WORDS, STR_64_WORDS, STR_64_U8_SIZE, StringSer, StringDes}; use xous::{CID, msg_scalar_unpack, msg_blocking_scalar_unpack}; use xous_ipc::{Buffer, String}; @@ -633,32 +633,23 @@ fn xmain() -> ! { com.txrx(ComState::WLAN_LEAVE.verb); } Some(Opcode::WlanStatus) => { - const STATUS_MAX_LEN: usize = 160; - const RX_WORD_LEN: usize = STATUS_MAX_LEN/2; let mut buffer = unsafe { Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) }; - let mut rx: [u8; RX_WORD_LEN*2] = [0; RX_WORD_LEN*2]; com.txrx(ComState::WLAN_STATUS.verb); - let size = com.wait_txrx(ComState::LINK_READ.verb, Some(STD_TIMEOUT)) as usize; - let size = if size > STATUS_MAX_LEN { STATUS_MAX_LEN } else { size as usize }; - for i in 0..RX_WORD_LEN { - let w = com.wait_txrx(ComState::LINK_READ.verb, Some(STD_TIMEOUT)) as u16; - let n = i * 2; - let (lsb, msb) = match 0 { - _ if n + 1 < size => ((w & 0xff) as u8, (w >> 8) as u8), - _ if n < size => ((w & 0xff) as u8, 0u8), - _ => (0u8, 0u8), - }; - rx[n] = lsb; - rx[n+1] = msb; + let mut rx_buf: [u16; STR_64_WORDS] = [0; STR_64_WORDS]; + for dest in rx_buf.iter_mut() { + *dest = com.wait_txrx(ComState::LINK_READ.verb, Some(STD_TIMEOUT)); } - info!("size: {}", size); - info!("rx[0]: {}", rx[0] as u8); - let status = core::str::from_utf8(&rx[0..size]) - .unwrap_or("COM bus error:\nutf8 decode failed"); - let status_str = String::::from_str(&status); - let _ = buffer.replace(status_str); + let mut des = StringDes::::new(); + match des.decode_u16(&rx_buf) { + Ok(status) => { + info!("status: {}", status); + let status_str = String::::from_str(&status); + let _ = buffer.replace(status_str); + } + _ => info!("status decode failed"), + }; } None => {error!("unknown opcode"); break}, } From 8baccc00631eb167b136c94be797018eb02eed02 Mon Sep 17 00:00:00 2001 From: Sam Blenny <68084116+samblenny@users.noreply.github.com> Date: Fri, 6 Aug 2021 10:02:30 +0000 Subject: [PATCH 10/11] Remove dead code for ip shellchat command This stuff was left over from an old idea that I didn't implement. Signed-off-by: samblenny --- services/shellchat/src/cmds.rs | 3 -- services/shellchat/src/cmds/ip.rs | 90 ------------------------------- 2 files changed, 93 deletions(-) delete mode 100644 services/shellchat/src/cmds/ip.rs diff --git a/services/shellchat/src/cmds.rs b/services/shellchat/src/cmds.rs index 43aded60f..59a85d3c1 100644 --- a/services/shellchat/src/cmds.rs +++ b/services/shellchat/src/cmds.rs @@ -98,7 +98,6 @@ mod console; use console::*; mod memtest; use memtest::*; mod keys; use keys::*; mod wlan; use wlan::*; -mod ip; use ip::*; //mod fcc; use fcc::*; //mod pds; // dependency of the FCC file @@ -184,7 +183,6 @@ impl CmdEnv { let mut echo_cmd = Echo {}; // this command has no persistent storage, so we can "create" it every time we call dispatch (but it's a zero-cost absraction so this doesn't actually create any instructions) let mut wlan_cmd = Wlan {}; - let mut ip_cmd = Ip {}; let mut ver_cmd = Ver{}; let mut backlight_cmd = Backlight{}; let mut accel_cmd = Accel{}; @@ -212,7 +210,6 @@ impl CmdEnv { &mut self.memtest_cmd, &mut self.keys_cmd, &mut wlan_cmd, - &mut ip_cmd, //&mut self.fcc_cmd, ]; diff --git a/services/shellchat/src/cmds/ip.rs b/services/shellchat/src/cmds/ip.rs deleted file mode 100644 index 67976f09d..000000000 --- a/services/shellchat/src/cmds/ip.rs +++ /dev/null @@ -1,90 +0,0 @@ -use crate::{CommonEnv, ShellCmdApi}; -use core::fmt::Write; -use xous_ipc::String; - -#[derive(Debug)] -pub struct Ip {} - -/** -ip shell command: -- list: show ip address, netmask, gateway, dns server, etc. -- ping host: send 3 ICMP pings to host (ip/hostname) -- udptx host port ...: send a UDP packet with string ... to host:port -- udprx: listen on udp localhost:port and echo payload of first incoming - packet (5s timeout) -*/ -impl<'a> ShellCmdApi<'a> for Ip { - cmd_api!(ip); // inserts boilerplate for command API - - fn process( - &mut self, - args: String<1024>, - _env: &mut CommonEnv, - ) -> Result>, xous::Error> { - let mut ret = String::<1024>::new(); - let helpstring = "ip [list] [ping host] [udptx host port ...] [udprx port]"; - let mut show_help = false; - - let mut tokens = args.as_str().unwrap().split(' '); - if let Some(sub_cmd) = tokens.next() { - match sub_cmd { - "list" => { - //env.com.ip_list().unwrap(); - write!(ret, "ip list").unwrap(); - } - "ping" => { - if let Some(host) = tokens.next() { - //env.com.ip_ping(&host).unwrap(); - write!(ret, "ip ping {}", host).unwrap(); - } else { - show_help = true; - } - } - "udptx" => { - if let (Some(host), Some(port)) = (tokens.next(), tokens.next()) { - let mut val = String::<1024>::new(); - join_tokens(&mut val, &mut tokens); - //env.com.ip_udptx(&host, &port, &val).unwrap(); - write!(ret, "ip udptx {} {} {}", host, port, val).unwrap(); - } else { - show_help = true; - } - } - "udprx" => { - if let Some(port) = tokens.next() { - //env.com.ip_updprx(&port).unwrap(); - write!(ret, "ip udprx {}", port).unwrap(); - } else { - show_help = true; - } - } - _ => { - show_help = true; - } - } - } else { - show_help = true; - } - if show_help { - write!(ret, "{}", helpstring).unwrap(); - } - Ok(Some(ret)) - } -} - -/** -Join an iterator of string tokens with spaces. - -This is intended to reverse the effect of .split(' ') in the context of a very simple -command parser. This is a lazy way to avoid building a parser for quoted strings, since -SSIDs or passwords might include spaces. -*/ -fn join_tokens<'a>(buf: &mut String<1024>, tokens: impl Iterator) { - for (i, tok) in tokens.enumerate() { - if i == 0 { - write!(buf, "{}", tok).unwrap(); - } else { - write!(buf, " {}", tok).unwrap(); - } - } -} From a1bd9c18fde7a379736d881330d20fdad8794bc0 Mon Sep 17 00:00:00 2001 From: Sam Blenny <68084116+samblenny@users.noreply.github.com> Date: Fri, 13 Aug 2021 22:41:25 +0000 Subject: [PATCH 11/11] Update com_rs submodule to get new WLAN_* verbs Signed-off-by: samblenny --- imports/com_rs-ref/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imports/com_rs-ref/Cargo.toml b/imports/com_rs-ref/Cargo.toml index bda166513..607343de8 100644 --- a/imports/com_rs-ref/Cargo.toml +++ b/imports/com_rs-ref/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" description = "com_rs import package" [dependencies] -#com_rs = { git = "https://github.com/betrusted-io/com_rs.git", rev = "4b45a42ad2d932550566d6c32ec1e1dd60e93c67" } -com_rs = { path = "../../../betrusted-ec/sw/com_rs" } +com_rs = { git = "https://github.com/betrusted-io/com_rs.git", rev = "8959b373adc359f03a0da7c000bd8208b47d90a7" } +#com_rs = { path = "../../../betrusted-ec/sw/com_rs" } # targeting hardware