From 6cf0954463cd42ba434dad025677ff58ba2ec584 Mon Sep 17 00:00:00 2001
From: mikecarper <mikecarper@gmail.com>
Date: Thu, 23 Jul 2026 23:50:22 -0700
Subject: [PATCH] Defer repeater adverts outside remote command stack

---
 examples/simple_repeater/MyMesh.cpp | 20 ++++++++++++++++++++
 examples/simple_repeater/MyMesh.h   |  4 ++++
 2 files changed, 24 insertions(+)

diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp
index 5fb5dcc8..2d6afeed 100644
--- a/examples/simple_repeater/MyMesh.cpp
+++ b/examples/simple_repeater/MyMesh.cpp
@@ -2461,6 +2461,9 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
   last_millis = 0;
   uptime_millis = 0;
   next_local_advert = next_flood_advert = 0;
+  pending_self_advert_delay = 0;
+  pending_self_advert = false;
+  pending_self_advert_flood = false;
   next_battery_alert_check = 0;
   next_rx_watchdog_check = 0;
   next_recent_repeater_sweep = 0;
@@ -3652,6 +3655,17 @@ bool MyMesh::formatFileSystem() {
 }
 
 void MyMesh::sendSelfAdvertisement(int delay_millis, bool flood) {
+  // CommonCLI can invoke this while handling an encrypted remote-admin packet.
+  // Creating the advert signs it with Ed25519, whose large stack frame would
+  // otherwise sit on top of the entire RX/decrypt/command call chain and
+  // overflow the nRF52 Arduino loop task's 4 KiB stack. Defer the work until
+  // Mesh::loop() has returned and that inbound call chain has unwound.
+  pending_self_advert_delay = delay_millis > 0 ? (uint32_t)delay_millis : 0;
+  pending_self_advert_flood = flood;
+  pending_self_advert = true;
+}
+
+void MyMesh::sendSelfAdvertisementNow(uint32_t delay_millis, bool flood) {
   mesh::Packet *pkt = createSelfAdvert();
   if (pkt) {
     if (flood) {
@@ -7097,6 +7111,12 @@ void MyMesh::loop() {
   // Check radio FIRST to ensure we don't miss incoming packets
   // MQTT processing runs in a separate FreeRTOS task on Core 0, so we don't call bridge.loop() here
   mesh::Mesh::loop();
+  if (pending_self_advert) {
+    const uint32_t delay_millis = pending_self_advert_delay;
+    const bool flood = pending_self_advert_flood;
+    pending_self_advert = false;
+    sendSelfAdvertisementNow(delay_millis, flood);
+  }
   checkRxInactivityWatchdog();
 #if !defined(PORTABLE_MQTT_OBSERVER)
   checkBatteryAlert();
diff --git a/examples/simple_repeater/MyMesh.h b/examples/simple_repeater/MyMesh.h
index 9a5d6d32..8edd7d95 100644
--- a/examples/simple_repeater/MyMesh.h
+++ b/examples/simple_repeater/MyMesh.h
@@ -204,6 +204,9 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks
   uint32_t last_millis;
   uint64_t uptime_millis;
   unsigned long next_local_advert, next_flood_advert;
+  uint32_t pending_self_advert_delay;
+  bool pending_self_advert;
+  bool pending_self_advert_flood;
   unsigned long next_battery_alert_check;
   unsigned long next_rx_watchdog_check;
   unsigned long next_recent_repeater_sweep;
@@ -402,6 +405,7 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks
   uint8_t handleAnonClockReq(const mesh::Identity& sender, uint32_t sender_timestamp, const uint8_t* data);
   int handleRequest(ClientInfo* sender, uint32_t sender_timestamp, uint8_t* payload, size_t payload_len);
   mesh::Packet* createSelfAdvert();
+  void sendSelfAdvertisementNow(uint32_t delay_millis, bool flood);
   bool sendRepeatersFloodText(const char* text, const TransportKey* scope = nullptr,
                               mesh::Packet** queued_packet = nullptr);
   uint8_t getRegionDepth(const RegionEntry* region);