Always set the channel corresponding to a node (#5287)

2025-02-26 22:33:24 +00:00 · 2024-11-09 04:30:12 +01:00 · 2024-11-09 04:30:12 +01:00 · 893efe4f11
commit 893efe4f11
parent 2c2213ef9b
1 changed files with 3 additions and 2 deletions
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@ -187,9 +187,10 @@ ErrorCode Router::sendLocal(meshtastic_MeshPacket *p, RxSource src)
            handleReceived(p, src);
        }

-        if (!p->channel && !p->pki_encrypted) { // don't override if a channel was requested
+        // don't override if a channel was requested and no need to set it when PKI is enforced
+        if (!p->channel && !p->pki_encrypted) {
            meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->to);
-            if (node && node->user.public_key.size == 0) {
+            if (node) {
                p->channel = node->channel;
                LOG_DEBUG("localSend to channel %d", p->channel);
            }