Get gcoap::gcoap_get_blockwise() to work, refactor

Author: j-devel

examples/xbd-net/debug.setup.bash

@@ -4,6 +4,7 @@ alias nnn='nn-notap'
 alias ee-wifi='make run-esp32-wroom32'
 
 alias mr='EMU_NATIVE_TAP=tap1  make native-run-riot'
+alias tb='mr | a debug'  # ()> b
 
 alias ee='echo "assuming tap0/br0 is already set up" && make build-esp32 && RIOT_BOARD=esp32-ethernet-kit-v1_0  EMU_ESP32_NIC="tap,model=open_eth,ifname=tap0,script=no,downscript=no"  make esp32-run-riot'
 alias nn='echo "assuming tap1 is already set up" && IPV6_AUTO=0 IPV6_ADDR=fe80::78ec:5fff:febd:add9  make build-native && EMU_NATIVE_TAP=tap1  make native-run-riot'

examples/xbd-net/src/lib.rs

@@ -151,11 +151,13 @@ async fn xbd_main() -> Result<(), i8> {
     Ok(())
 }
 
-use futures_util::stream::StreamExt;
-use xbd::{BlockwiseError, BLOCKWISE_STATES_MAX, blockwise_states_print, blockwise_states_debug};
+use xbd::gcoap::{
+    BlockwiseError, BLOCKWISE_STATES_MAX,
+    blockwise_states_print, blockwise_states_debug};
 
 async fn test_blockwise(addr_self: &str) -> Result<(), BlockwiseError> {
-    use xbd::gcoap::{gcoap_get, GcoapMemoState};
+    use xbd::gcoap::{gcoap_get, gcoap_get_blockwise, GcoapMemoState};
+    use futures_util::StreamExt;
 
     if 0 == 1 { // !! do test with alias='nns'
         println!("🧪 debug NEW [gcoap-dtls]");
@@ -211,7 +213,7 @@ $ libcoap/local/bin/coap-client -m get coaps://[::1]/.well-known/core -k "secret
 
     //
 
-    let get_blockwise = || Xbd::async_gcoap_get_blockwise(addr_self, "/const/song.txt");
+    let get_blockwise = || gcoap_get_blockwise(addr_self, "/const/song.txt");
 
     //
 
@@ -292,7 +294,7 @@ $ libcoap/local/bin/coap-client -m get coaps://[::1]/.well-known/core -k "secret
     //
 
     println!("🧪 debug NEW [blockwise-timeout]");
-    let get_blockwise_timeout = || Xbd::async_gcoap_get_blockwise(
+    let get_blockwise_timeout = || gcoap_get_blockwise(
         "[::1]:5680", "/const/song.txt"); // induce `Timeout`, not 5683
 
     let mut bs = get_blockwise_timeout()?;
@@ -306,7 +308,7 @@ $ libcoap/local/bin/coap-client -m get coaps://[::1]/.well-known/core -k "secret
     //
 
     println!("🧪 debug NEW [blockwise-resp-none]");
-    let get_blockwise_resp_none = || Xbd::async_gcoap_get_blockwise(
+    let get_blockwise_resp_none = || gcoap_get_blockwise(
         "[::1]:5683", "/const/song2.txt"); // induce `Resp(None)`
 
     let mut bs = get_blockwise_resp_none()?;

examples/xbd-net/src/xbd/gcoap.rs

@@ -1,7 +1,6 @@
 use core::{future::Future, pin::Pin, task::{Context, Poll, Waker}};
 use core::ffi::c_void;
 use futures_util::task::AtomicWaker;
-use super::{BlockwiseData, BLOCKWISE_HDR_MAX};
 use mcu_if::utils::u8_slice_from;
 
 pub const REQ_ADDR_MAX: usize = 64;
@@ -75,6 +74,14 @@ const COAP_METHOD_PUT      : CoapMethod = 0x03;
 
 //
 
+pub use super::blockwise::{
+    BlockwiseError, BLOCKWISE_STATES_MAX,
+    blockwise_states_print, blockwise_states_debug};
+
+use super::blockwise::{BlockwiseStream, BlockwiseData, BLOCKWISE_HDR_MAX};
+pub fn gcoap_get_blockwise(addr: &str, uri: &str) -> Result<BlockwiseStream, BlockwiseError> {
+    BlockwiseData::send_blockwise_req(None, Some((addr, uri)), None)
+}
 
 pub fn gcoap_get(addr: &str, uri: &str) -> impl Future<Output = GcoapMemoState> + 'static {
     Req::new(COAP_METHOD_GET, addr, uri, None)

examples/xbd-net/src/xbd/mod.rs

@@ -13,15 +13,10 @@ pub use shell::process_shell_stream;
 
 mod stream;
 
-mod blockwise;
-use blockwise::{BlockwiseStream, BlockwiseData, BLOCKWISE_HDR_MAX};
-pub use blockwise::{
-    BlockwiseError, BLOCKWISE_STATES_MAX,
-    blockwise_states_print, blockwise_states_debug};
-
 mod timeout;
 use timeout::Timeout;
 
+mod blockwise;
 pub mod gcoap;
 
 use core::future::Future;
@@ -107,9 +102,4 @@ impl Xbd {
     pub fn async_set_timeout<F>(msec: u32, cb: F) -> impl Future<Output = ()> + 'static where F: FnOnce() + 'static {
         Timeout::new(msec, Some(Box::new(cb)))
     }
-
-    // !!!!
-    pub fn async_gcoap_get_blockwise(addr: &str, uri: &str) -> Result<BlockwiseStream, BlockwiseError> {
-        BlockwiseData::send_blockwise_req(None, Some((addr, uri)), None)
-    }
 }

examples/xbd-net/src/xbd/shell.rs

@@ -216,7 +216,7 @@ async fn test_blockwise_all() {
 async fn test_async_blockwise() {
     println!("test_async_blockwise(): ^^");
 
-    let mut bs = crate::Xbd::async_gcoap_get_blockwise(
+    let mut bs = crate::xbd::gcoap::gcoap_get_blockwise(
         "[::1]:5683", "/const/song.txt").unwrap();
     while let Some(req) = bs.next().await {
         println!("@@ out: {:?}", req.await);