mirror of
https://github.com/meshcore-dev/MeshCore.git
synced 2026-03-30 19:15:49 +00:00
Prevent packet loops and duplicates
Implement a "seen packets" table to track packets that have already been processed by the serial bridge. This prevents packets from being re-transmitted over the serial link if they have already been seen, and it stops inbound packets from serial from being re-injected into the mesh if they are duplicates. Duplicate inbound packets are now freed to prevent memory leaks.
This commit is contained in:
@@ -42,10 +42,12 @@ void SerialBridge::begin() {
|
||||
}
|
||||
|
||||
void SerialBridge::onPacketTransmitted(mesh::Packet* packet) {
|
||||
SerialPacket spkt;
|
||||
spkt.len = packet->writeTo(spkt.payload);
|
||||
spkt.crc = fletcher16(spkt.payload, spkt.len);
|
||||
_serial->write((uint8_t *)&spkt, sizeof(SerialPacket));
|
||||
if (!_seen_packets.hasSeen(packet)) {
|
||||
SerialPacket spkt;
|
||||
spkt.len = packet->writeTo(spkt.payload);
|
||||
spkt.crc = fletcher16(spkt.payload, spkt.len);
|
||||
_serial->write((uint8_t *)&spkt, sizeof(SerialPacket));
|
||||
}
|
||||
}
|
||||
|
||||
void SerialBridge::loop() {
|
||||
@@ -92,7 +94,11 @@ void SerialBridge::onPacketReceived() {
|
||||
}
|
||||
|
||||
new_pkt->readFrom(bytes, len);
|
||||
_mgr->queueInbound(new_pkt, 0);
|
||||
if (!_seen_packets.hasSeen(new_pkt)) {
|
||||
_mgr->queueInbound(new_pkt, 0);
|
||||
} else {
|
||||
_mgr->free(new_pkt);
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "helpers/AbstractBridge.h"
|
||||
#include "helpers/SimpleMeshTables.h"
|
||||
#include <Stream.h>
|
||||
|
||||
#ifdef BRIDGE_OVER_SERIAL
|
||||
@@ -25,6 +26,7 @@ public:
|
||||
private:
|
||||
Stream* _serial;
|
||||
mesh::PacketManager* _mgr;
|
||||
SimpleMeshTables _seen_packets;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user