From e75561016b5f94850abbae90b0498aeac061c5d8 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Thu, 21 May 2020 15:55:57 -0700
Subject: [PATCH] retransmissions work again

---
 src/mesh/PacketHistory.cpp  |  4 ++--
 src/mesh/ReliableRouter.cpp | 17 ++++++++++++-----
 src/mesh/ReliableRouter.h   |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/mesh/PacketHistory.cpp b/src/mesh/PacketHistory.cpp
index 30a448f975..7361daad8b 100644
--- a/src/mesh/PacketHistory.cpp
+++ b/src/mesh/PacketHistory.cpp
@@ -29,7 +29,7 @@ bool PacketHistory::wasSeenRecently(const MeshPacket *p, bool withUpdate)
             recentPackets.erase(recentPackets.begin() + i); // delete old record
         } else {
             if (r.id == p->id && r.sender == p->from) {
-                DEBUG_MSG("Found existing broadcast record for fr=0x%x,to=0x%x,id=%d\n", p->from, p->to, p->id);
+                DEBUG_MSG("Found existing packet record for fr=0x%x,to=0x%x,id=%d\n", p->from, p->to, p->id);
 
                 // Update the time on this record to now
                 if (withUpdate)
@@ -48,7 +48,7 @@ bool PacketHistory::wasSeenRecently(const MeshPacket *p, bool withUpdate)
         r.sender = p->from;
         r.rxTimeMsec = now;
         recentPackets.push_back(r);
-        DEBUG_MSG("Adding broadcast record for fr=0x%x,to=0x%x,id=%d\n", p->from, p->to, p->id);
+        DEBUG_MSG("Adding packet record for fr=0x%x,to=0x%x,id=%d\n", p->from, p->to, p->id);
     }
 
     return false;
diff --git a/src/mesh/ReliableRouter.cpp b/src/mesh/ReliableRouter.cpp
index e14355ece0..78c6b93a0c 100644
--- a/src/mesh/ReliableRouter.cpp
+++ b/src/mesh/ReliableRouter.cpp
@@ -36,6 +36,8 @@ void ReliableRouter::handleReceived(MeshPacket *p)
     NodeNum ourNode = getNodeNum();
 
     if (p->from == ourNode && p->to == NODENUM_BROADCAST) {
+        DEBUG_MSG("Received someone rebroadcasting for us fr=0x%x,to=0x%x,id=%d\n", p->from, p->to, p->id);
+
         // We are seeing someone rebroadcast one of our broadcast attempts.
         // If this is the first time we saw this, cancel any retransmissions we have queued up and generate an internal ack for
         // the original sending process.
@@ -77,7 +79,7 @@ void ReliableRouter::handleReceived(MeshPacket *p)
  */
 void ReliableRouter::sendAckNak(bool isAck, NodeNum to, PacketId idFrom)
 {
-    DEBUG_MSG("Sending an ack=%d,to=%d,idFrom=%d", isAck, to, idFrom);
+    DEBUG_MSG("Sending an ack=%d,to=%d,idFrom=%d\n", isAck, to, idFrom);
     auto p = allocForSending();
     p->hop_limit = 0; // Assume just immediate neighbors for now
     p->to = to;
@@ -108,7 +110,7 @@ PendingPacket::PendingPacket(MeshPacket *p)
 bool ReliableRouter::stopRetransmission(NodeNum from, PacketId id)
 {
     auto key = GlobalPacketId(from, id);
-    stopRetransmission(key);
+    return stopRetransmission(key);
 }
 
 bool ReliableRouter::stopRetransmission(GlobalPacketId key)
@@ -150,12 +152,17 @@ void ReliableRouter::doRetransmissions()
         // FIXME, handle 51 day rolloever here!!!
         if (p.nextTxMsec <= now) {
             if (p.numRetransmissions == 0) {
-                DEBUG_MSG("Reliable send failed, returning a nak\n");
+                DEBUG_MSG("Reliable send failed, returning a nak fr=0x%x,to=0x%x,id=%d\n", p.packet->from, p.packet->to,
+                          p.packet->id);
                 sendAckNak(false, p.packet->from, p.packet->id);
                 stopRetransmission(it->first);
             } else {
-                DEBUG_MSG("Sending reliable retransmission\n");
-                send(packetPool.allocCopy(*p.packet));
+                DEBUG_MSG("Sending reliable retransmission fr=0x%x,to=0x%x,id=%d, tries left=%d\n", p.packet->from, p.packet->to,
+                          p.packet->id, p.numRetransmissions);
+
+                // Note: we call the superclass version because we don't want to have our version of send() add a new
+                // retransmission record
+                FloodingRouter::send(packetPool.allocCopy(*p.packet));
 
                 // Queue again
                 --p.numRetransmissions;
diff --git a/src/mesh/ReliableRouter.h b/src/mesh/ReliableRouter.h
index 2217c92c0e..e63806af55 100644
--- a/src/mesh/ReliableRouter.h
+++ b/src/mesh/ReliableRouter.h
@@ -48,7 +48,7 @@ struct PendingPacket {
     PendingPacket() {}
     PendingPacket(MeshPacket *p);
 
-    void setNextTx() { nextTxMsec = millis() + random(10 * 1000, 12 * 1000); }
+    void setNextTx() { nextTxMsec = millis() + random(30 * 1000, 22 * 1000); }
 };
 
 class GlobalPacketIdHashFunction