rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-14 14:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Discard everything if downlink isn't on (#8578)

Browse Source
This commit is contained in:
Benjamin Faershtein
2025-11-06 19:01:15 -08:00
committed by Ben Meadors
parent bdb3fb1477
commit b25797e1b3
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mqtt/MQTT.cpp
View File

@@ -59,7 +59,13 @@ inline void onReceiveProto(char *topic, byte *payload, size_t length)
LOG_ERROR("Invalid MQTT service envelope, topic %s, len %u!", topic, length); LOG_ERROR("Invalid MQTT service envelope, topic %s, len %u!", topic, length);
return; return;
} }
const meshtastic_Channel &ch = channels.getByName(e.channel_id); const meshtastic_Channel &ch = channels.getByName(e.channel_id);
// Find channel by channel_id and check downlink_enabled
if (!(strcmp(e.channel_id, "PKI") == 0 ||
(strcmp(e.channel_id, channels.getGlobalId(ch.index)) == 0 && ch.settings.downlink_enabled))) {
return;
}
// Generate node ID from nodenum for comparison // Generate node ID from nodenum for comparison
std::string nodeId = nodeDB->getNodeId(); std::string nodeId = nodeDB->getNodeId();
if (strcmp(e.gateway_id, nodeId.c_str()) == 0) { if (strcmp(e.gateway_id, nodeId.c_str()) == 0) {
@@ -77,11 +83,6 @@ inline void onReceiveProto(char *topic, byte *payload, size_t length)
return; return;
} }
// Find channel by channel_id and check downlink_enabled
if (!(strcmp(e.channel_id, "PKI") == 0 ||
(strcmp(e.channel_id, channels.getGlobalId(ch.index)) == 0 && ch.settings.downlink_enabled))) {
return;
}
LOG_INFO("Received MQTT topic %s, len=%u", topic, length); LOG_INFO("Received MQTT topic %s, len=%u", topic, length);
if (e.packet->hop_limit > HOP_MAX || e.packet->hop_start > HOP_MAX) { if (e.packet->hop_limit > HOP_MAX || e.packet->hop_start > HOP_MAX) {
LOG_INFO("Invalid hop_limit(%u) or hop_start(%u)", e.packet->hop_limit, e.packet->hop_start); LOG_INFO("Invalid hop_limit(%u) or hop_start(%u)", e.packet->hop_limit, e.packet->hop_start);