Skip to content

fix(mesh): don't evict ACKs when a background-priority packet arrives full #10435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DatanoiseTV wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(mesh): don't evict ACKs when a background-priority packet arrives full #10435

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/mesh/Router.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,22 @@ int32_t Router::runOnce()
*/
void Router::enqueueReceivedMessage(meshtastic_MeshPacket *p)
{
// Try enqueue until successful
while (!fromRadioQueue.enqueue(p, 0)) {
meshtastic_MeshPacket *old_p;
old_p = fromRadioQueue.dequeuePtr(0); // Dequeue and discard the oldest packet
if (old_p) {
printPacket("fromRadioQ full, drop oldest!", old_p);
packetPool.release(old_p);
// Try enqueue, but if the queue is full and the incoming packet is itself
// low priority, drop *it* rather than evicting an older (likely higher-
// priority) packet such as an ACK or routing reply.
if (!fromRadioQueue.enqueue(p, 0)) {
if (p->priority != meshtastic_MeshPacket_Priority_UNSET && p->priority <= meshtastic_MeshPacket_Priority_BACKGROUND) {
printPacket("fromRadioQ full, drop incoming low-prio!", p);
packetPool.release(p);
return;
}
// Higher-priority packet — fall back to evicting until it fits.
while (!fromRadioQueue.enqueue(p, 0)) {
meshtastic_MeshPacket *old_p = fromRadioQueue.dequeuePtr(0);
if (old_p) {
printPacket("fromRadioQ full, drop oldest!", old_p);
packetPool.release(old_p);
}
}
}
// Nasty hack because our threading is primitive. interfaces shouldn't need to know about routers FIXME
Expand Down
Loading