From 836e8add1bcb09c476a3aa3d7a416a15b8c21e6a Mon Sep 17 00:00:00 2001
From: Ulf Lilleengen <ulf@digili.no>
Date: Thu, 5 Sep 2024 10:02:45 +0200
Subject: [PATCH] Mintor fixes after testing re-attach

---
 embassy-net-nrf91/src/context.rs             | 20 +++++---
 examples/nrf9160/src/bin/modem_tcp_client.rs | 54 +++++++++++---------
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/embassy-net-nrf91/src/context.rs b/embassy-net-nrf91/src/context.rs
index 511468316..6b841aa16 100644
--- a/embassy-net-nrf91/src/context.rs
+++ b/embassy-net-nrf91/src/context.rs
@@ -275,24 +275,28 @@ impl<'a> Control<'a> {
         })
     }
 
-    /// Run a control loop for this context, ensuring that reaattach is handled.
-    pub async fn run<F: Fn(&Status)>(&self, config: &Config<'_>, reattach: F) -> Result<(), Error> {
-        self.configure(config).await?;
+    async fn wait_attached(&self) -> Result<Status, Error> {
         while !self.attached().await? {
             Timer::after(Duration::from_secs(1)).await;
         }
         let status = self.status().await?;
+        Ok(status)
+    }
+
+    /// Run a control loop for this context, ensuring that reaattach is handled.
+    pub async fn run<F: Fn(&Status)>(&self, config: &Config<'_>, reattach: F) -> Result<(), Error> {
+        self.configure(config).await?;
+        let status = self.wait_attached().await?;
         let mut fd = self.control.open_raw_socket().await;
         reattach(&status);
 
         loop {
             if !self.attached().await? {
+                trace!("detached");
+
                 self.control.close_raw_socket(fd).await;
-                self.attach().await?;
-                while !self.attached().await? {
-                    Timer::after(Duration::from_secs(1)).await;
-                }
-                let status = self.status().await?;
+                let status = self.wait_attached().await?;
+                trace!("attached");
                 fd = self.control.open_raw_socket().await;
                 reattach(&status);
             }
diff --git a/examples/nrf9160/src/bin/modem_tcp_client.rs b/examples/nrf9160/src/bin/modem_tcp_client.rs
index fb14b746f..b7d56802d 100644
--- a/examples/nrf9160/src/bin/modem_tcp_client.rs
+++ b/examples/nrf9160/src/bin/modem_tcp_client.rs
@@ -10,6 +10,7 @@ use core::str::FromStr;
 use defmt::{info, unwrap, warn};
 use embassy_executor::Spawner;
 use embassy_net::{Ipv4Address, Ipv4Cidr, Stack, StackResources};
+use embassy_net_nrf91::context::Status;
 use embassy_net_nrf91::{context, Runner, State, TraceBuffer, TraceReader};
 use embassy_nrf::buffered_uarte::{self, BufferedUarteTx};
 use embassy_nrf::gpio::{AnyPin, Level, Output, OutputDrive, Pin};
@@ -58,34 +59,38 @@ async fn control_task(
     unwrap!(
         control
             .run(&config, |status| {
-                let Some(IpAddr::V4(addr)) = status.ip else {
-                    panic!("Unexpected IP address");
-                };
-                let addr = Ipv4Address(addr.octets());
-
-                let gateway = if let Some(IpAddr::V4(addr)) = status.gateway {
-                    Some(Ipv4Address(addr.octets()))
-                } else {
-                    None
-                };
-
-                let mut dns_servers = Vec::new();
-                for dns in status.dns.iter() {
-                    if let IpAddr::V4(ip) = dns {
-                        unwrap!(dns_servers.push(Ipv4Address(ip.octets())));
-                    }
-                }
-
-                stack.set_config_v4(embassy_net::ConfigV4::Static(embassy_net::StaticConfigV4 {
-                    address: Ipv4Cidr::new(addr, 32),
-                    gateway,
-                    dns_servers,
-                }));
+                stack.set_config_v4(status_to_config(status));
             })
             .await
     );
 }
 
+fn status_to_config(status: &Status) -> embassy_net::ConfigV4 {
+    let Some(IpAddr::V4(addr)) = status.ip else {
+        panic!("Unexpected IP address");
+    };
+    let addr = Ipv4Address(addr.octets());
+
+    let gateway = if let Some(IpAddr::V4(addr)) = status.gateway {
+        Some(Ipv4Address(addr.octets()))
+    } else {
+        None
+    };
+
+    let mut dns_servers = Vec::new();
+    for dns in status.dns.iter() {
+        if let IpAddr::V4(ip) = dns {
+            unwrap!(dns_servers.push(Ipv4Address(ip.octets())));
+        }
+    }
+
+    embassy_net::ConfigV4::Static(embassy_net::StaticConfigV4 {
+        address: Ipv4Cidr::new(addr, 32),
+        gateway,
+        dns_servers,
+    })
+}
+
 #[embassy_executor::task]
 async fn blink_task(pin: AnyPin) {
     let mut led = Output::new(pin, Level::Low, OutputDrive::Standard);
@@ -193,7 +198,6 @@ async fn main(spawner: Spawner) {
             info!("txd: {}", core::str::from_utf8(msg).unwrap());
             Timer::after_secs(1).await;
         }
-        // Test auto-attach
-        unwrap!(control.detach().await);
+        Timer::after_secs(4).await;
     }
 }