Merge pull request #1 from meshcore-dev/dev

Merge dev branch
This commit is contained in:
Quency-D 2026-01-22 15:06:44 +08:00 committed by GitHub
commit 9f38835543
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 646 additions and 5 deletions

View file

@ -133,7 +133,7 @@ void BaseChatMesh::onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id,
}
putBlobByKey(id.pub_key, PUB_KEY_SIZE, temp_buf, plen);
bool is_new = false;
bool is_new = false; // true = not in contacts[], false = exists in contacts[]
if (from == NULL) {
if (!shouldAutoAddContactType(parser.getType())) {
ContactInfo ci;
@ -142,7 +142,6 @@ void BaseChatMesh::onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id,
return;
}
is_new = true;
from = allocateContactSlot();
if (from == NULL) {
ContactInfo ci;