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

sync to vanilla 1.16

Browse Source
This commit is contained in:
liquidraver
2026-06-06 16:42:39 +02:00
parent 4353936328
commit ffe9ea652d
15 changed files with 105 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zephcore/helpers/BaseChatMesh.cpp
+16 -7
View File
@@ -82,18 +82,27 @@ void BaseChatMesh::bootstrapRTCfromContacts()
}
}
ContactInfo *BaseChatMesh::allocateContactSlot()
ContactInfo *BaseChatMesh::allocateContactSlot(bool transient_only)
{
if (num_contacts < MAX_CONTACTS) {
return &contacts[num_contacts++];
} else if (shouldOverwriteWhenFull()) {
} else if (transient_only || shouldOverwriteWhenFull()) {
int oldest_idx = -1;
uint32_t oldest_lastmod = 0xFFFFFFFF;
for (int i = 0; i < num_contacts; i++) {
bool is_favourite = (contacts[i].flags & 0x01) != 0;
if (!is_favourite && contacts[i].lastmod < oldest_lastmod) {
oldest_lastmod = contacts[i].lastmod;
oldest_idx = i;
if (transient_only) {
// transient/anon requests only ever recycle an existing anon slot
if (contacts[i].type == ADV_TYPE_NONE && contacts[i].lastmod < oldest_lastmod) {
oldest_lastmod = contacts[i].lastmod;
oldest_idx = i;
}
} else {
// never evict favourites or transient/anon contacts
bool is_favourite = (contacts[i].flags & 0x01) != 0;
if (!is_favourite && contacts[i].lastmod < oldest_lastmod && contacts[i].type != ADV_TYPE_NONE) {
oldest_lastmod = contacts[i].lastmod;
oldest_idx = i;
}
}
}
if (oldest_idx >= 0) {
@@ -740,7 +749,7 @@ ContactInfo *BaseChatMesh::lookupContactByPubKey(const uint8_t *pub_key, int pre
bool BaseChatMesh::addContact(const ContactInfo &contact)
{
ContactInfo *dest = allocateContactSlot();
ContactInfo *dest = allocateContactSlot(contact.type == ADV_TYPE_NONE);
if (dest) {
*dest = contact;
dest->shared_secret_valid = false;