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

Fix millis() wraparound in PacketQueue time comparisons

Browse Source 
PacketQueue::countBefore() and PacketQueue::get() use unsigned
comparison (_schedule_table[j] > now) to check if a packet is
scheduled for the future. This breaks when millis() wraps around
after ~49.7 days: packets scheduled just before the wrap appear
to be in the far future and get stuck in the queue.

Use signed subtraction instead, matching the approach already used
by Dispatcher::millisHasNowPassed(). This correctly handles the
wraparound for time differences up to ~24.8 days in either
direction, well beyond the maximum queue delay of 32 seconds.
This commit is contained in:
Daniel Novak
2026-02-22 18:01:30 +01:00
parent d05d6abab8
commit 011edd3c99
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/helpers/StaticPoolPacketManager.cpp
View File

@@ -11,7 +11,7 @@ PacketQueue::PacketQueue(int max_entries) {
int PacketQueue::countBefore(uint32_t now) const { int PacketQueue::countBefore(uint32_t now) const {
int n = 0; int n = 0;
for (int j = 0; j < _num; j++) { for (int j = 0; j < _num; j++) {
if (_schedule_table[j] > now) continue; // scheduled for future... ignore for now if ((int32_t)(_schedule_table[j] - now) > 0) continue; // scheduled for future... ignore for now
n++; n++;
} }
return n; return n;
@@ -21,7 +21,7 @@ mesh::Packet* PacketQueue::get(uint32_t now) {
uint8_t min_pri = 0xFF; uint8_t min_pri = 0xFF;
int best_idx = -1; int best_idx = -1;
for (int j = 0; j < _num; j++) { for (int j = 0; j < _num; j++) {
if (_schedule_table[j] > now) continue; // scheduled for future... ignore for now if ((int32_t)(_schedule_table[j] - now) > 0) continue; // scheduled for future... ignore for now
if (_pri_table[j] < min_pri) { // select most important priority amongst non-future entries if (_pri_table[j] < min_pri) { // select most important priority amongst non-future entries
min_pri = _pri_table[j]; min_pri = _pri_table[j];
best_idx = j; best_idx = j;