From 683539220d8297729d5134bd87b9108575d801fc Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sat, 27 Sep 2025 05:55:04 -0500
Subject: [PATCH] Re-use Uplink / downlink controls for UDP

---
 src/mesh/Router.cpp                | 14 +++++++++++---
 src/mesh/udp/UdpMulticastHandler.h | 16 +++++++++++++++-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp
index 171c383ba..a92cc502a 100644
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -355,13 +355,21 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
         if (moduleConfig.mqtt.enabled && isFromUs(p) && mqtt) {
             mqtt->onSend(*p, *p_decoded, chIndex);
         }
+#endif
+#if HAS_UDP_MULTICAST
+        // Only publish to UDP if we're the original transmitter of the packet
+        if (udpHandler && config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST &&
+            isFromUs(p)) {
+            udpHandler->onSend(const_cast<meshtastic_MeshPacket *>(p), chIndex);
+        }
 #endif
         packetPool.release(p_decoded);
     }
-
 #if HAS_UDP_MULTICAST
-    if (udpHandler && config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) {
-        udpHandler->onSend(const_cast<meshtastic_MeshPacket *>(p));
+    // For packets that are already encrypted, we need to determine the channel from packet info
+    else if (udpHandler && config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST &&
+             isFromUs(p)) {
+        udpHandler->onSend(const_cast<meshtastic_MeshPacket *>(p), p->channel);
     }
 #endif
 
diff --git a/src/mesh/udp/UdpMulticastHandler.h b/src/mesh/udp/UdpMulticastHandler.h
index 2df8686a3..0a27a316e 100644
--- a/src/mesh/udp/UdpMulticastHandler.h
+++ b/src/mesh/udp/UdpMulticastHandler.h
@@ -2,6 +2,7 @@
 #if HAS_UDP_MULTICAST
 #include "configuration.h"
 #include "main.h"
+#include "mesh/Channels.h"
 #include "mesh/Router.h"
 
 #if HAS_ETHERNET && defined(ARCH_NRF52)
@@ -53,6 +54,13 @@ class UdpMulticastHandler final
         LOG_DEBUG("Decoding MeshPacket from UDP len=%u", packetLength);
         bool isPacketDecoded = pb_decode_from_bytes(packet.data(), packetLength, &meshtastic_MeshPacket_msg, &mp);
         if (isPacketDecoded && router && mp.which_payload_variant == meshtastic_MeshPacket_encrypted_tag) {
+            // Check if downlink is enabled for this channel
+            auto &ch = channels.getByIndex(mp.channel);
+            if (!ch.settings.downlink_enabled) {
+                LOG_DEBUG("UDP downlink disabled for channel %d", mp.channel);
+                return;
+            }
+
             mp.transport_mechanism = meshtastic_MeshPacket_TransportMechanism_TRANSPORT_MULTICAST_UDP;
             mp.pki_encrypted = false;
             mp.public_key.size = 0;
@@ -65,11 +73,17 @@ class UdpMulticastHandler final
         }
     }
 
-    bool onSend(const meshtastic_MeshPacket *mp)
+    bool onSend(const meshtastic_MeshPacket *mp, ChannelIndex chIndex)
     {
         if (!mp || !udp) {
             return false;
         }
+        // Check if uplink is enabled for this specific channel
+        auto &ch = channels.getByIndex(chIndex);
+        if (!ch.settings.uplink_enabled) {
+            LOG_DEBUG("UDP uplink disabled for channel %d", chIndex);
+            return false;
+        }
 #if defined(ARCH_NRF52)
         if (!isEthernetAvailable()) {
             return false;