From dd18d94a03c82213e6a9ecef6d9ad79257180ac0 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 9 Jan 2022 13:12:36 +0800 Subject: [PATCH] e2e demo of pddb working now, we can store an ssid/password pair...finally. --- services/com/src/main.rs | 2 +- services/pddb/src/main.rs | 43 ++++++++++++++++++++++------- services/shellchat/src/cmds/wlan.rs | 2 +- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/services/com/src/main.rs b/services/com/src/main.rs index b147df878..761169231 100644 --- a/services/com/src/main.rs +++ b/services/com/src/main.rs @@ -740,7 +740,7 @@ fn xmain() -> ! { let mut des = StringDes::::new(); match des.decode_u16(&rx_buf) { Ok(status) => { - info!("status: {}", status); + log::debug!("status: {}", status); let status_str = String::::from_str(&status); let _ = buffer.replace(status_str); } diff --git a/services/pddb/src/main.rs b/services/pddb/src/main.rs index 99c62745f..1e8b302c8 100644 --- a/services/pddb/src/main.rs +++ b/services/pddb/src/main.rs @@ -406,7 +406,7 @@ struct TokenRecord { #[xous::xous_main] fn xmain() -> ! { log_server::init_wait().unwrap(); - log::set_max_level(log::LevelFilter::Debug); + log::set_max_level(log::LevelFilter::Info); log::info!("my PID is {}", xous::process::id()); let xns = xous_names::XousNames::new().unwrap(); @@ -830,6 +830,7 @@ fn xmain() -> ! { let mut buffer = unsafe { Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) }; let mut req = buffer.to_original::().unwrap(); if key_token.is_some() { + log::debug!("key list already in progress"); req.code = PddbRequestCode::AccessDenied; buffer.replace(req).unwrap(); continue; @@ -842,17 +843,31 @@ fn xmain() -> ! { None }; let dict = req.dict.as_str().expect("dict utf-8 decode error"); + log::debug!("counting keys in dict {} basis {:?}", dict, bname); match basis_cache.key_list(&mut pddb_os, dict, bname) { Ok(list) => { - req.index = list.len() as u32; - for key in list { - key_list.push(key); + log::debug!("count: {}", list.len()); + if list.len() > 0 { + req.index = list.len() as u32; + for key in list { + log::debug!("key list: {}", key); + key_list.push(key); + } + } else { + log::debug!("count is 0, resetting state"); + // no keys to list, so reset the state + key_token = None; + key_list.clear(); } req.code = PddbRequestCode::NoErr; } - Err(e) => match e.kind() { - std::io::ErrorKind::NotFound => req.code = PddbRequestCode::NotFound, - _ => req.code = PddbRequestCode::InternalError, + Err(e) => { + key_token = None; + key_list.clear(); + match e.kind() { + std::io::ErrorKind::NotFound => req.code = PddbRequestCode::NotFound, + _ => req.code = PddbRequestCode::InternalError, + } } } buffer.replace(req).unwrap(); @@ -869,14 +884,17 @@ fn xmain() -> ! { } else { req.key = xous_ipc::String::::from_str(&key_list[req.index as usize]); req.code = PddbRequestCode::NoErr; + log::debug!("fetching key at index {}: {}", req.index, req.key); // the last index requested must be the highest one! if req.index == key_list.len() as u32 - 1 { + log::debug!("last key, resetting state"); key_token = None; key_list.clear(); } } } } else { + log::debug!("multiple concurrent requests detected, returning error"); req.code = PddbRequestCode::AccessDenied; } buffer.replace(req).unwrap(); @@ -897,9 +915,14 @@ fn xmain() -> ! { None }; let list = basis_cache.dict_list(&mut pddb_os, bname); - req.index = list.len() as u32; - for dict in list { - dict_list.push(dict); + if list.len() > 0 { + req.index = list.len() as u32; + for dict in list { + dict_list.push(dict); + } + } else { // no dicts to list, reset the state + dict_token = None; + dict_list.clear(); } req.code = PddbRequestCode::NoErr; buffer.replace(req).unwrap(); diff --git a/services/shellchat/src/cmds/wlan.rs b/services/shellchat/src/cmds/wlan.rs index d567ce1f3..9bea64405 100644 --- a/services/shellchat/src/cmds/wlan.rs +++ b/services/shellchat/src/cmds/wlan.rs @@ -34,7 +34,7 @@ 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] [status]"; + let helpstring = "wlan [on] [off] [setssid ...] [setpass ...] [join] [leave] [status] [save]"; let mut show_help = false; let mut tokens = args.as_str().unwrap().split(' ');