mirror of
https://github.com/meshcore-dev/MeshCore.git
synced 2026-07-16 23:12:02 +00:00
Christoph Koehler
4f701b7aec
hasSeen() was simultaneously a predicate and a mutator — it inserted the packet hash on every miss, making five call sites that only wanted to mark a packet as sent call it with the return value discarded. Split into: - wasSeen() — pure predicate, no side effects - markSeen() — explicit insert All query sites now call markSeen() immediately after wasSeen() returns false, preserving identical runtime behaviour. The five mark-only send sites (sendFlood, sendDirect, sendZeroHop x2) now call markSeen directly. Also fixes three bridge sites (BridgeBase, ESPNowBridge, RS232Bridge) that had the same query+implicit-insert pattern. Tests: add test/test_mesh_tables/ covering wasSeen purity, markSeen, dup stats, and clear. Update SHA256 mock to produce deterministic output (previously finalize() was a no-op). Add Packet.cpp to native build filter.
50 lines
1.3 KiB
C++
50 lines
1.3 KiB
C++
#include "BridgeBase.h"
|
|
|
|
#include <Arduino.h>
|
|
|
|
bool BridgeBase::isRunning() const {
|
|
return _initialized;
|
|
}
|
|
|
|
const char *BridgeBase::getLogDateTime() {
|
|
static char tmp[32];
|
|
uint32_t now = _rtc->getCurrentTime();
|
|
DateTime dt = DateTime(now);
|
|
sprintf(tmp, "%02d:%02d:%02d - %d/%d/%d U", dt.hour(), dt.minute(), dt.second(), dt.day(), dt.month(),
|
|
dt.year());
|
|
return tmp;
|
|
}
|
|
|
|
uint16_t BridgeBase::fletcher16(const uint8_t *data, size_t len) {
|
|
uint8_t sum1 = 0, sum2 = 0;
|
|
|
|
for (size_t i = 0; i < len; i++) {
|
|
sum1 = (sum1 + data[i]) % 255;
|
|
sum2 = (sum2 + sum1) % 255;
|
|
}
|
|
|
|
return (sum2 << 8) | sum1;
|
|
}
|
|
|
|
bool BridgeBase::validateChecksum(const uint8_t *data, size_t len, uint16_t received_checksum) {
|
|
uint16_t calculated_checksum = fletcher16(data, len);
|
|
return received_checksum == calculated_checksum;
|
|
}
|
|
|
|
void BridgeBase::handleReceivedPacket(mesh::Packet *packet) {
|
|
// Guard against uninitialized state
|
|
if (_initialized == false) {
|
|
BRIDGE_DEBUG_PRINTLN("RX packet received before initialization\n");
|
|
_mgr->free(packet);
|
|
return;
|
|
}
|
|
|
|
if (!_seen_packets.wasSeen(packet)) {
|
|
_seen_packets.markSeen(packet);
|
|
// bridge_delay provides a buffer to prevent immediate processing conflicts in the mesh network.
|
|
_mgr->queueInbound(packet, millis() + _prefs->bridge_delay);
|
|
} else {
|
|
_mgr->free(packet);
|
|
}
|
|
}
|