From f625e8c83705bbd5aabe06b265954a8e7f50fac8 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Fri, 20 Sep 2024 07:22:11 -0500
Subject: [PATCH] Additional decoded packet ignores

---
 src/mqtt/MQTT.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
index c15ac3325..6840700e5 100644
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -164,6 +164,16 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
                         return;
                     }
                     if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
+                        if (moduleConfig.mqtt.encryption_enabled) {
+                            LOG_INFO("Ignoring decoded message on MQTT, encryption is enabled.\n");
+                            packetPool.release(p);
+                            return;
+                        }
+                        if (p->decoded.portnum == meshtastic_PortNum_ADMIN_APP) {
+                            LOG_INFO("Ignoring decoded admin packet.\n");
+                            packetPool.release(p);
+                            return;
+                        }
                         p->channel = ch.index;
                     }