pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-09 04:47:58 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'master' into illuminace-sensor2

Browse Source
This commit is contained in:
Ben Meadors 2025-01-10 06:00:55 -06:00 committed by GitHub
commit bfa34e17b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats 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 // 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); meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->to);
if (node) { if (node) {
p->channel = node->channel; 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 // cache/learn of the existence of nodes (i.e. FloodRouter) that they should not
handleReceived(p); handleReceived(p);
packetPool.release(p); packetPool.release(p);
} }