Skip to content

fix(mesh): skip pre-encryption packet copy when MQTT does not need it #10434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DatanoiseTV wants to merge 1 commit into
base: develop
Choose a base branch
from
+15 −7
Open

fix(mesh): skip pre-encryption packet copy when MQTT does not need it #10434

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions src/mesh/Router.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,24 +372,32 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it

DEBUG_HEAP_BEFORE;
meshtastic_MeshPacket *p_decoded = packetPool.allocCopy(*p);
DEBUG_HEAP_AFTER("Router::send", p_decoded);
// The pre-encryption copy is only needed to feed MQTT::onSend; skip it
// entirely on builds/devices where MQTT is excluded or disabled.
meshtastic_MeshPacket *p_decoded = nullptr;
#if !MESHTASTIC_EXCLUDE_MQTT
const bool needDecodedForMqtt = moduleConfig.mqtt.enabled && isFromUs(p) && mqtt;
if (needDecodedForMqtt) {
DEBUG_HEAP_BEFORE;
p_decoded = packetPool.allocCopy(*p);
DEBUG_HEAP_AFTER("Router::send", p_decoded);
}
Comment on lines +379 to +384
#endif

auto encodeResult = perhapsEncode(p);
if (encodeResult != meshtastic_Routing_Error_NONE) {
packetPool.release(p_decoded);
if (p_decoded)
packetPool.release(p_decoded);
p->channel = 0; // Reset the channel to 0, so we don't use the failing hash again
abortSendAndNak(encodeResult, p);
return encodeResult; // FIXME - this isn't a valid ErrorCode
}
#if !MESHTASTIC_EXCLUDE_MQTT
// Only publish to MQTT if we're the original transmitter of the packet
if (moduleConfig.mqtt.enabled && isFromUs(p) && mqtt) {
if (p_decoded) {
mqtt->onSend(*p, *p_decoded, chIndex);
packetPool.release(p_decoded);
}
Comment on lines +396 to 399
#endif
packetPool.release(p_decoded);
}

#if HAS_UDP_MULTICAST
Expand Down
Loading