dandri/ZephCore
1
0
Fork 0
mirror of https://github.com/liquidraver/ZephCore.git synced 2026-09-02 04:08:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix path-discovery response wrongly rejected at non-default path_hash_mode (2/3-byte hashes)

Browse Source
This commit is contained in:
liquidraver
2026-07-01 21:03:35 +02:00
parent bd363781ac
commit f1124e6783
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zephcore/app/CompanionMesh.cpp
+3 -5
View File
@@ -303,7 +303,7 @@ bool CompanionMesh::onContactPathRecv(ContactInfo &from, uint8_t *in_path, uint8
if (tag == _pending_discovery) {
_pending_discovery = 0;
if (in_path_len <= MAX_PATH_SIZE && out_path_len <= MAX_PATH_SIZE) {
if (mesh::Packet::isValidPathLen(in_path_len) && mesh::Packet::isValidPathLen(out_path_len)) {
uint8_t rsp[172];
int i = 0;
rsp[i++] = PUSH_CODE_PATH_DISCOVERY_RESP;
@@ -311,11 +311,9 @@ bool CompanionMesh::onContactPathRecv(ContactInfo &from, uint8_t *in_path, uint8
memcpy(&rsp[i], from.id.pub_key, 6);
i += 6;
rsp[i++] = out_path_len;
memcpy(&rsp[i], out_path, out_path_len);
i += out_path_len;
i += mesh::Packet::writePath(&rsp[i], out_path, MAX_PATH_SIZE, out_path_len);
rsp[i++] = in_path_len;
memcpy(&rsp[i], in_path, in_path_len);
i += in_path_len;
i += mesh::Packet::writePath(&rsp[i], in_path, MAX_PATH_SIZE, in_path_len);
sendPush(rsp[0], &rsp[1], i - 1);
} else {
LOG_WRN("onContactPathRecv: invalid path sizes: out=%d in=%d",