reliable unicast 1 hop works!

src/mesh/PacketHistory.cpp

@@ -13,7 +13,7 @@ PacketHistory::PacketHistory()
 /**
  * Update recentBroadcasts and return true if we have already seen this packet
  */
-bool PacketHistory::wasSeenRecently(const MeshPacket *p)
+bool PacketHistory::wasSeenRecently(const MeshPacket *p, bool withUpdate)
 {
     if (p->id == 0) {
         DEBUG_MSG("Ignoring message with zero id\n");
@@ -32,7 +32,8 @@ bool PacketHistory::wasSeenRecently(const MeshPacket *p)
                 DEBUG_MSG("Found existing broadcast 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
-                r.rxTimeMsec = now;
+                if (withUpdate)
+                    r.rxTimeMsec = now;
                 return true;
             }
 
@@ -41,12 +42,14 @@ bool PacketHistory::wasSeenRecently(const MeshPacket *p)
     }
 
     // Didn't find an existing record, make one
-    PacketRecord r;
-    r.id = p->id;
-    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);
+    if (withUpdate) {
+        PacketRecord r;
+        r.id = p->id;
+        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);
+    }
 
     return false;
 }

src/mesh/PacketHistory.h

@@ -61,6 +61,8 @@ class PacketHistory
 
     /**
      * Update recentBroadcasts and return true if we have already seen this packet
+     *
+     * @param withUpdate if true and not found we add an entry to recentPackets
      */
-    bool wasSeenRecently(const MeshPacket *p);
+    bool wasSeenRecently(const MeshPacket *p, bool withUpdate = true);
 };

src/mesh/RadioLibInterface.cpp

@@ -315,7 +315,7 @@ void RadioLibInterface::handleReceiveInterrupt()
 /** start an immediate transmit */
 void RadioLibInterface::startSend(MeshPacket *txp)
 {
-    DEBUG_MSG("Starting low level send from=0x%x, id=%u!\n", txp->from, txp->id);
+    DEBUG_MSG("Starting low level send from=0x%x, id=%u, want_ack=%d\n", txp->from, txp->id, txp->want_ack);
     setStandby(); // Cancel any already in process receives
 
     size_t numbytes = beginSending(txp);

src/mesh/ReliableRouter.cpp

@@ -46,7 +46,7 @@ void ReliableRouter::handleReceived(MeshPacket *p)
 
             // we are careful to only read/update wasSeenRecently _after_ confirming this is an ack (to not mess
             // up broadcasts)
-            if ((ackId || nakId) && !wasSeenRecently(p)) {
+            if ((ackId || nakId) && !wasSeenRecently(p, false)) {
                 if (ackId) {
                     DEBUG_MSG("Received a ack=%d, stopping retransmissions\n", ackId);
                     stopRetransmission(p->to, ackId);