rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-23 10:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.6

Browse Source
This commit is contained in:
Ben Meadors
2025-01-10 06:27:18 -06:00
committed by GitHub
parent 988d8cd1ab f18a92e8c5
commit 7e063c1dda
15 changed files with 74 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesh/Router.cpp
View File

@@ -187,7 +187,7 @@ ErrorCode Router::sendLocal(meshtastic_MeshPacket *p, RxSource src)
}
// don't override if a channel was requested and no need to set it when PKI is enforced
if (!p->channel && !p->pki_encrypted) {
if (!p->channel && !p->pki_encrypted && !isBroadcast(p->to)) {
meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->to);
if (node) {
p->channel = node->channel;
@@ -679,4 +679,4 @@ void Router::perhapsHandleReceived(meshtastic_MeshPacket *p)
// cache/learn of the existence of nodes (i.e. FloodRouter) that they should not
handleReceived(p);
packetPool.release(p);
}
}