DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* CMD_GET_ADVERT_PATH bug fix

Browse Source
This commit is contained in:
Scott Powell
2026-02-24 14:23:59 +11:00
parent 9d5c4865c3
commit b14879ce2d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/companion_radio/MyMesh.cpp
View File

@@ -350,7 +350,7 @@ void MyMesh::onDiscoveredContact(ContactInfo &contact, bool is_new, uint8_t path
} }
// add inbound-path to mem cache // add inbound-path to mem cache
if (path && path_len <= sizeof(AdvertPath::path)) { // check path is valid if (path && mesh::Packet::isValidPathLen(path_len)) { // check path is valid
AdvertPath* p = advert_paths; AdvertPath* p = advert_paths;
uint32_t oldest = 0xFFFFFFFF; uint32_t oldest = 0xFFFFFFFF;
for (int i = 0; i < ADVERT_PATH_TABLE_SIZE; i++) { // check if already in table, otherwise evict oldest for (int i = 0; i < ADVERT_PATH_TABLE_SIZE; i++) { // check if already in table, otherwise evict oldest
@@ -367,8 +367,7 @@ void MyMesh::onDiscoveredContact(ContactInfo &contact, bool is_new, uint8_t path
memcpy(p->pubkey_prefix, contact.id.pub_key, sizeof(p->pubkey_prefix)); memcpy(p->pubkey_prefix, contact.id.pub_key, sizeof(p->pubkey_prefix));
strcpy(p->name, contact.name); strcpy(p->name, contact.name);
p->recv_timestamp = getRTCClock()->getCurrentTime(); p->recv_timestamp = getRTCClock()->getCurrentTime();
p->path_len = path_len; p->path_len = mesh::Packet::copyPath(p->path, path, path_len);
memcpy(p->path, path, p->path_len);
} }
if (!is_new) dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY); // only schedule lazy write for contacts that are in contacts[] if (!is_new) dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY); // only schedule lazy write for contacts that are in contacts[]
@@ -1696,11 +1695,12 @@ void MyMesh::handleCmdFrame(size_t len) {
} }
} }
if (found) { if (found) {
out_frame[0] = RESP_CODE_ADVERT_PATH; int i = 0;
memcpy(&out_frame[1], &found->recv_timestamp, 4); out_frame[i++] = RESP_CODE_ADVERT_PATH;
out_frame[5] = found->path_len; memcpy(&out_frame[i], &found->recv_timestamp, 4); i += 4;
memcpy(&out_frame[6], found->path, found->path_len); out_frame[i++] = found->path_len;
_serial->writeFrame(out_frame, 6 + found->path_len); i += mesh::Packet::writePath(&out_frame[i], found->path, found->path_len);
_serial->writeFrame(out_frame, i);
} else { } else {
writeErrFrame(ERR_CODE_NOT_FOUND); writeErrFrame(ERR_CODE_NOT_FOUND);
} }