pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-25 06:12:29 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Drop packets if toPhoneQueue is full, unless it's text/RangeTest (#2918)

Browse Source
This commit is contained in:
GUVWAF 2023-10-30 12:12:22 +01:00 committed by GitHub
parent 4052194dfe
commit 8b8fffda81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mesh/MeshService.cpp
View File

@ -267,14 +267,22 @@ void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
void MeshService::sendToPhone(meshtastic_MeshPacket *p) void MeshService::sendToPhone(meshtastic_MeshPacket *p)
{ {
perhapsDecode(p);
if (toPhoneQueue.numFree() == 0) { if (toPhoneQueue.numFree() == 0) {
if (p->decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP ||
p->decoded.portnum == meshtastic_PortNum_RANGE_TEST_APP) {
LOG_WARN("ToPhone queue is full, discarding oldest\n"); LOG_WARN("ToPhone queue is full, discarding oldest\n");
meshtastic_MeshPacket *d = toPhoneQueue.dequeuePtr(0); meshtastic_MeshPacket *d = toPhoneQueue.dequeuePtr(0);
if (d) if (d)
releaseToPool(d); releaseToPool(d);
} else {
LOG_WARN("ToPhone queue is full, dropping packet.\n");
releaseToPool(p);
return;
}
} }
perhapsDecode(p);
assert(toPhoneQueue.enqueue(p, 0)); assert(toPhoneQueue.enqueue(p, 0));
fromNum++; fromNum++;
} }