Browse Source

Merge pull request #1795 from DanielNovak/fix-packetqueue-millis-wraparound

Fix millis() wraparound in PacketQueue time comparisons
pull/1417/merge
ripplebiz 3 months ago
committed by GitHub
parent
commit
8ee4867397
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      src/helpers/StaticPoolPacketManager.cpp

4
src/helpers/StaticPoolPacketManager.cpp

@ -11,7 +11,7 @@ PacketQueue::PacketQueue(int max_entries) {
int PacketQueue::countBefore(uint32_t now) const {
int n = 0;
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++;
}
return n;
@ -21,7 +21,7 @@ mesh::Packet* PacketQueue::get(uint32_t now) {
uint8_t min_pri = 0xFF;
int best_idx = -1;
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
min_pri = _pri_table[j];
best_idx = j;

Loading…
Cancel
Save