From 9d1aa10a504bf15bf20e93f4d0f95f5b26ad9d28 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 2 Mar 2022 21:20:20 +0800 Subject: [PATCH] add join command to libstd-test --- Cargo.lock | 1 + emulation/linux-server-rootfs.jffs2 | Bin 4194304 -> 4194304 bytes services/libstd-test/Cargo.toml | 1 + services/libstd-test/src/main.rs | 9 +++++++-- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 92344e804..64a032dd0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1210,6 +1210,7 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" name = "libstd-test" version = "0.1.0" dependencies = [ + "com", "dns", "log", "log-server", diff --git a/emulation/linux-server-rootfs.jffs2 b/emulation/linux-server-rootfs.jffs2 index 5e79c6f108e75647a92d1cb586892939bc1a8072..634badafe4b2b8a4739a1c6a942323308f8464a9 100644 GIT binary patch delta 7582 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 delta 1354 zcmYk$y-(C|9LI5vrz^)Z98jK*=kojv1?~V9u_`P$*i8qA{s|p#_$1zj3tUIW{sCvK zlQfkrf; z87*i<8`{xfK5qe|3{y%)h%%)#cA_(@Jerg-M>|x`^6MTtV-t-2LG0T;-G46mnB6RU@vTPqTc%oMDv&dzPil5l7JG zS)O1lumZtaWQ9U*iKQ+RSI}2jzF@AhN`k${Qr3whXd5g~Fg96%VCk$-$ZfIIZQ=_0 z4$BwJG^-@o8J4n396{S-d4jRe3Iyu`D-?1MS?VL=3i<)d7tF`3l3*XQlqbXyG=t>{ r##2@xSkG9YkbBNjkBBSi$1MLibMUrsk%_+D4~2`pqgU@!N%!O*1_>^{ diff --git a/services/libstd-test/Cargo.toml b/services/libstd-test/Cargo.toml index 4a0209ba1..6a2ab573e 100644 --- a/services/libstd-test/Cargo.toml +++ b/services/libstd-test/Cargo.toml @@ -16,6 +16,7 @@ num-derive = {version = "0.3.3", default-features = false} num-traits = {version = "0.2.14", default-features = false} net = {path = "../net"} dns = {path = "../dns"} +com = {path = "../com"} [target.'cfg(not(any(windows,unix)))'.dependencies] utralib = { path = "../../utralib"} diff --git a/services/libstd-test/src/main.rs b/services/libstd-test/src/main.rs index 1c7e7e7d5..1ea2b8b72 100644 --- a/services/libstd-test/src/main.rs +++ b/services/libstd-test/src/main.rs @@ -6,11 +6,16 @@ fn test_main() -> ! { let tt = ticktimer_server::Ticktimer::new().unwrap(); log::info!("waiting for others to boot"); - tt.sleep_ms(5000).unwrap(); + tt.sleep_ms(1000).unwrap(); + let xns = xous_names::XousNames::new().unwrap(); + let mut com = com::Com::new(&xns).unwrap(); + com.wlan_join().expect("couldn't issue join command"); + log::info!("waiting for join to finish"); + tt.sleep_ms(1000).unwrap(); + let host = "bunniefoo.com"; log::info!("attempting to resolve {}", host); - let xns = xous_names::XousNames::new().unwrap(); let dns = dns::Dns::new(&xns).unwrap(); match dns.lookup(host) { Ok(ipaddr) => {