From c36b233c49d43989e7874ae25ecf5711a4e04384 Mon Sep 17 00:00:00 2001 From: Ryan Tolboom Date: Mon, 22 Nov 2021 21:31:12 -0500 Subject: [PATCH] ACK retried want_ack packets --- src/mesh/FloodingRouter.cpp | 2 +- src/mesh/FloodingRouter.h | 2 +- src/mesh/ReliableRouter.cpp | 13 ++++++++++++- src/mesh/ReliableRouter.h | 2 +- src/mesh/Router.h | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/mesh/FloodingRouter.cpp b/src/mesh/FloodingRouter.cpp index fa37aa50..14ce6dd0 100644 --- a/src/mesh/FloodingRouter.cpp +++ b/src/mesh/FloodingRouter.cpp @@ -17,7 +17,7 @@ ErrorCode FloodingRouter::send(MeshPacket *p) return Router::send(p); } -bool FloodingRouter::shouldFilterReceived(const MeshPacket *p) +bool FloodingRouter::shouldFilterReceived(MeshPacket *p) { if (wasSeenRecently(p)) { // Note: this will also add a recent packet record printPacket("Ignoring incoming msg, because we've already seen it", p); diff --git a/src/mesh/FloodingRouter.h b/src/mesh/FloodingRouter.h index 41bc898d..ca5bac66 100644 --- a/src/mesh/FloodingRouter.h +++ b/src/mesh/FloodingRouter.h @@ -50,7 +50,7 @@ class FloodingRouter : public Router, protected PacketHistory * Called immedately on receiption, before any further processing. * @return true to abandon the packet */ - virtual bool shouldFilterReceived(const MeshPacket *p); + virtual bool shouldFilterReceived(MeshPacket *p); /** * Look for broadcasts we need to rebroadcast diff --git a/src/mesh/ReliableRouter.cpp b/src/mesh/ReliableRouter.cpp index c7f77e5d..dd2fd9b2 100644 --- a/src/mesh/ReliableRouter.cpp +++ b/src/mesh/ReliableRouter.cpp @@ -26,7 +26,7 @@ ErrorCode ReliableRouter::send(MeshPacket *p) return FloodingRouter::send(p); } -bool ReliableRouter::shouldFilterReceived(const MeshPacket *p) +bool ReliableRouter::shouldFilterReceived(MeshPacket *p) { // Note: do not use getFrom() here, because we want to ignore messages sent from phone if (p->to == NODENUM_BROADCAST && p->from == getNodeNum()) { @@ -54,6 +54,17 @@ bool ReliableRouter::shouldFilterReceived(const MeshPacket *p) } } + /* send acks for repeated packets that want acks and are destined for us + * this way if an ACK is dropped and a packet is resent we'll ACK the resent packet + * make sure wasSeenRecently _doesn't_ update + * finding the channel requires decoding the packet. */ + if (p->want_ack && (p->to == getNodeNum()) && wasSeenRecently(p, false)) { + if (perhapsDecode(p)) { + sendAckNak(Routing_Error_NONE, getFrom(p), p->id, p->channel); + DEBUG_MSG("acking a repeated want_ack packet\n"); + } + } + return FloodingRouter::shouldFilterReceived(p); } diff --git a/src/mesh/ReliableRouter.h b/src/mesh/ReliableRouter.h index e0890ff2..7bec0cf3 100644 --- a/src/mesh/ReliableRouter.h +++ b/src/mesh/ReliableRouter.h @@ -102,7 +102,7 @@ class ReliableRouter : public FloodingRouter /** * We hook this method so we can see packets before FloodingRouter says they should be discarded */ - virtual bool shouldFilterReceived(const MeshPacket *p); + virtual bool shouldFilterReceived(MeshPacket *p); /** * Add p to the list of packets to retransmit occasionally. We will free it once we stop retransmitting. diff --git a/src/mesh/Router.h b/src/mesh/Router.h index a2d75d35..a11b4702 100644 --- a/src/mesh/Router.h +++ b/src/mesh/Router.h @@ -90,7 +90,7 @@ class Router : protected concurrency::OSThread * Called immedately on receiption, before any further processing. * @return true to abandon the packet */ - virtual bool shouldFilterReceived(const MeshPacket *p) { return false; } + virtual bool shouldFilterReceived(MeshPacket *p) { return false; } /** * Every (non duplicate) packet this node receives will be passed through this method. This allows subclasses to