mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-25 03:07:44 +00:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
40 lines
1.1 KiB
C++
40 lines
1.1 KiB
C++
#pragma once
|
|
|
|
#include "NextHopRouter.h"
|
|
|
|
/**
|
|
* This is a mixin that extends Router with the ability to do (one hop only) reliable message sends.
|
|
*/
|
|
class ReliableRouter : public NextHopRouter
|
|
{
|
|
public:
|
|
/**
|
|
* Constructor
|
|
*
|
|
*/
|
|
// ReliableRouter();
|
|
|
|
/**
|
|
* Send a packet on a suitable interface. This routine will
|
|
* later free() the packet to pool. This routine is not allowed to stall.
|
|
* If the txmit queue is full it might return an error
|
|
*/
|
|
virtual ErrorCode send(meshtastic_MeshPacket *p) override;
|
|
|
|
protected:
|
|
/**
|
|
* Look for acks/naks or someone retransmitting us
|
|
*/
|
|
virtual void sniffReceived(const meshtastic_MeshPacket *p, const meshtastic_Routing *c) override;
|
|
|
|
/**
|
|
* We hook this method so we can see packets before FloodingRouter says they should be discarded
|
|
*/
|
|
virtual bool shouldFilterReceived(const meshtastic_MeshPacket *p) override;
|
|
|
|
private:
|
|
/**
|
|
* Should this packet be ACKed with a want_ack for reliable delivery?
|
|
*/
|
|
bool shouldSuccessAckWithWantAck(const meshtastic_MeshPacket *p);
|
|
}; |