Drop oldest packet from radio when queue is full (#5212)

And still notify Router Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2025-02-01 02:09:57 +00:00 · 2024-11-01 21:48:55 +01:00 · 2024-11-01 21:48:55 +01:00 · 2d4d36c605
commit 2d4d36c605
parent cbe74009a9
1 changed files with 10 additions and 7 deletions
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@ -81,14 +81,17 @@ int32_t Router::runOnce()
 */
 void Router::enqueueReceivedMessage(meshtastic_MeshPacket *p)
 {
-    if (fromRadioQueue.enqueue(p, 0)) { // NOWAIT - fixme, if queue is full, delete older messages
-
-        // Nasty hack because our threading is primitive.  interfaces shouldn't need to know about routers FIXME
-        setReceivedMessage();
-    } else {
-        printPacket("BUG! fromRadioQueue is full! Discarding!", p);
-        packetPool.release(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);
+        }
    }
+    // Nasty hack because our threading is primitive.  interfaces shouldn't need to know about routers FIXME
+    setReceivedMessage();
 }

 /// Generate a unique packet id