From 3aa0cbd26a6f6fd0e9151e70f7fdfd77cbaa8cd4 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Tue, 3 Feb 2026 19:44:45 -0600
Subject: [PATCH] Add close method to AsyncUDP and improve UDP multicast
 handler lifecycle management

---
 src/mesh/udp/UdpMulticastHandler.h | 7 ++++---
 src/platform/nrf52/AsyncUDP.cpp    | 7 +++++++
 src/platform/nrf52/AsyncUDP.h      | 1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/mesh/udp/UdpMulticastHandler.h b/src/mesh/udp/UdpMulticastHandler.h
index 08d09bd3c..5d24c617f 100644
--- a/src/mesh/udp/UdpMulticastHandler.h
+++ b/src/mesh/udp/UdpMulticastHandler.h
@@ -50,14 +50,15 @@ class UdpMulticastHandler final
             return;
         }
         LOG_DEBUG("Stopping UDP multicast");
-#if !defined(ARCH_NRF52)
         udp.close();
-#endif
         isRunning = false;
     }
 
     void onReceive(AsyncUDPPacket packet)
     {
+        if (!isRunning) {
+            return;
+        }
         size_t packetLength = packet.length();
 #if defined(ARCH_NRF52)
         IPAddress ip = packet.remoteIP();
@@ -84,7 +85,7 @@ class UdpMulticastHandler final
 
     bool onSend(const meshtastic_MeshPacket *mp)
     {
-        if (!mp || !udp) {
+        if (!isRunning || !mp || !udp) {
             return false;
         }
 #if defined(ARCH_NRF52)
diff --git a/src/platform/nrf52/AsyncUDP.cpp b/src/platform/nrf52/AsyncUDP.cpp
index 836fb1307..d119ffddb 100644
--- a/src/platform/nrf52/AsyncUDP.cpp
+++ b/src/platform/nrf52/AsyncUDP.cpp
@@ -36,6 +36,13 @@ bool AsyncUDP::writeTo(const uint8_t *data, size_t len, IPAddress ip, uint16_t p
     return udp.endPacket();
 }
 
+void AsyncUDP::close()
+{
+    udp.stop();
+    localPort = 0;
+    _onPacket = nullptr;
+}
+
 // AsyncUDPPacket
 AsyncUDPPacket::AsyncUDPPacket(EthernetUDP &source) : _udp(source), _remoteIP(source.remoteIP()), _remotePort(source.remotePort())
 {
diff --git a/src/platform/nrf52/AsyncUDP.h b/src/platform/nrf52/AsyncUDP.h
index e2b406ba9..718277309 100644
--- a/src/platform/nrf52/AsyncUDP.h
+++ b/src/platform/nrf52/AsyncUDP.h
@@ -22,6 +22,7 @@ class AsyncUDP : public Print, private concurrency::OSThread
 
     bool listenMulticast(IPAddress multicastIP, uint16_t port, uint8_t ttl = 64);
     bool writeTo(const uint8_t *data, size_t len, IPAddress ip, uint16_t port);
+    void close();
 
     size_t write(uint8_t b) override;
     size_t write(const uint8_t *data, size_t len) override;