* TrafficManagement: flat unified cache + persistent next-hop overflow store Reworks the TrafficManagementModule cache layer (policing behaviour unchanged from upstream) and adds a routing-hint overflow store: - Flatten the ring: replace the cuckoo-hashed unified cache and the bucketed PSRAM NodeInfo index with plain flat arrays + linear scan (same idiom as WarmNodeStore). At LoRa packet rates an O(n) scan of the cache is negligible, and it removes a large amount of hashing/displacement complexity. The cache entry is 11 B; timestamps use a uniform +1 presence-offset so a 0 byte always means "empty" across every sub-store. Adds rebaseEpoch() so cached state survives the ~19 h relative-timestamp horizon instead of being flushed. - Next-hop overflow cache: setNextHop/getNextHopHint store a confirmed last-byte relay for a destination, written only from NextHopRouter's ACK-confirmed decision (and mirrored from TraceRoute). NextHopRouter::getNextHop falls back to this cache when the hot NodeDB has no hint, so DMs/relays to long-tail nodes keep routing after the node ages out of NodeInfoLite. - Persistence: preloadNextHopsFromNodeDB warm-starts the cache from persisted NodeInfoLite hints on first maintenance pass; next_hop entries are kept alive across the maintenance sweep (no TTL) and never clobbered by a stale preload. All packet-policing logic (rate limit, position dedup, unknown-packet drop, NodeInfo direct response, hop exhaustion) is the existing upstream behaviour, untouched. HAS_TRAFFIC_MANAGEMENT defaults on so the module is compiled in. (see note). Tests: upstream policing suite now actually runs (adds the MeshTypes.h include that gates HAS_TRAFFIC_MANAGEMENT) plus 4 next-hop tests. Role-aware throttles, politeness, precision clamp, port-interval and mesh-radius gating — and the rate-limit >255 saturation fix — are deferred to the advanced-TMM branch. Note: default dedup movement grid moves to ~91m, which also means 1.5km required to end up with the same signature position - coarser and therefore further than before. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * TrafficManagement: fix cppcheck constVariablePointer warning `node` in preloadNextHopsFromNodeDB() is never written through — mark it const to satisfy cppcheck's constVariablePointer check in CI. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Add multi-hop NextHop recovery tests and unit tests for routing reliability - Introduced a new test suite for multi-hop NextHop directed-message delivery and relay recovery in `test_nexthop_multihop_recovery.py`. This includes tests for end-to-end delivery and recovery after relay drop. - Implemented unit tests in `test_main.cpp` for NextHop routing reliability mitigations, covering: - M1: Ambiguity-aware last-byte resolution. - M2: NextHopRouter's strict-neighbor gate and hop limit checks. - M3: Route-health freshness and failure decay. - Enhanced mock classes to facilitate controlled testing of node behaviors and routing logic. * grafting fixed * Address Copilot review for PR #10735 (NextHop improvements) - docs/nexthop-routing-reliability.md: update status from "no code changes yet" to reflect that mitigations and tests are implemented RAM pressure and MIGRATION_VERBOSE concerns addressed upstream in PR2.5 (per-platform TRAFFIC_MANAGEMENT_CACHE_SIZE) and PR2 (verbose default=0) respectively; (0,0) sentinel fixed in PR2.5. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * CI: fix cppcheck constVariablePointer and test include path - NextHopRouter.cpp: qualify two RouteHealth *h locals as const — only read for stale-route checks, never mutated through the pointer - Router.cpp: qualify meshtastic_NodeInfoLite *node as const in shouldDecrementHopLimit — only read for favorite/role predicate - test_position_module/test_main.cpp: change bare PositionModule.h to modules/PositionModule.h — build_flags sets -Isrc, not -Isrc/modules, so the bare form fails to resolve in the native PlatformIO test env Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * WarmStore: cache device role + protected category in last_heard low bits Steal the low 6 bits of WarmNodeEntry.last_heard to carry an evicted node's device role (4 bits) and a protected category (2 bits) for the hop-trim path, at zero record-size cost (entry stays 40 B; no RAM/flash growth). The high bits remain a real unix-seconds timestamp, quantised to 64 s — ample for warm LRU ordering of long-tail nodes. - absorb() packs role/protectedCat; place()/ring replay store the raw word so metadata round-trips through flash. LRU compares masked time (warmTimeOf). - take() rehydration masks the metadata bits and restores the cached role so a re-admitted node isn't stuck at CLIENT until its next NodeInfo. - NodeDB classifies the category (favorite/ignored/verified -> Flag; tracker/sensor/tak_tracker -> Role) at each eviction site. - WarmNodeStore::lookupMeta() exposes role/category to consumers. - Bump WARM_RING_MAGIC (WRNG->WRN2): old rings read as erased and rebuild; warm data is a non-critical evictee cache, so discard-on-upgrade is safe. Tests: test_warm_store 11/11 (new meta round-trip + quantisation-aware ordering); NodeDB compiles (test_nodedb_blocked 4/4). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * WarmStore: migrate v1 rings/files by discarding last_heard, not the data Previously the WRNG->WRN2 magic bump treated old rings as erased, discarding all warm entries — including the PKI public keys that let evicted nodes keep decrypting DMs. Instead, read v1 (WRNG / WRM1) records and keep each node's identity + public key, discarding only last_heard (its low bits would otherwise be misread as the new role/protected metadata). Records re-rank and re-learn their role on next contact. - Ring backend (nRF52840): ringReadHeader accepts both magics and reports v1 via an out-param; replay zeroes last_heard for v1 records. If the active head page is v1, force a rotation so new v2 records never land in a v1-headered page (which would discard their freshly-set role on the next load). Legacy pages convert to v2 as the ring rotates. - File backend (warm.dat): bump WARM_STORE_MAGIC WRM1->WRM2; accept WRM1, verify CRC against the stored bytes, then discard last_heard and mark dirty so the next save rewrites as v2. Tests: test_warm_store 12/12 (adds test_ws_v1_migration_discardsLastHeard: key survives, role/protected reset). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * WarmStore: guard role bit-width + test eviction carries role/protected - static_assert that the device role enum still fits the 4-bit warm metadata field (WARM_ROLE_MASK); fails the build loudly if a new role is added past 15 rather than silently truncating role on eviction. (Max role today = 12.) - Add test_migration_carriesRoleAndProtectedIntoWarm: a demoted TRACKER lands in the warm tier with its key, role=TRACKER and protected category=Role; a demoted CLIENT carries role=CLIENT/None. Exercises the NodeDB eviction path + warmProtectedCategory classification (the warm-store unit tests only cover absorb() directly). Tests: test_nodedb_blocked 5/5. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix copilot comments * fix(test): restore #if HAS_TRAFFIC_MANAGEMENT guard in TMM test The rebase onto PR1.5 lost the top-level HAS_TRAFFIC_MANAGEMENT guard that PR1.5 introduced, leaving the #else/#endif tail orphaned and causing compile errors on non-TMM builds. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
177 lines
7.9 KiB
C++
177 lines
7.9 KiB
C++
#pragma once
|
|
|
|
#include "MeshTypes.h"
|
|
#include "mesh-pb-constants.h"
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
|
|
// Verbose tracing for the warm-store migration + NodeDB self-care. Per-event /
|
|
// per-boot chatter routes through this so it can be silenced in one place (set
|
|
// to 0) once they're proven; genuine LOG_WARN anomalies stay unconditional.
|
|
#ifndef MESHTASTIC_NODEDB_MIGRATION_VERBOSE
|
|
#define MESHTASTIC_NODEDB_MIGRATION_VERBOSE 0
|
|
#endif
|
|
#if MESHTASTIC_NODEDB_MIGRATION_VERBOSE
|
|
#define LOG_MIGRATION(...) LOG_INFO(__VA_ARGS__)
|
|
#else
|
|
#define LOG_MIGRATION(...) ((void)0)
|
|
#endif
|
|
|
|
#if WARM_NODE_COUNT > 0
|
|
|
|
/**
|
|
* Warm ("long-tail") node tier.
|
|
*
|
|
* Minimal identity record (NodeNum, last_heard, Curve25519 public key) for nodes
|
|
* evicted from the hot NodeInfoLite store, so DMs to/from them keep encrypting —
|
|
* the key is expensive to re-learn, the rest rebuilds from traffic in seconds.
|
|
* Flat fixed array, linear scan (only on hot-store misses), LRU by last_heard
|
|
* with keyed entries outranking keyless.
|
|
*
|
|
* Persistence: nRF52840 uses a 12 KB raw-flash record-ring below LittleFS
|
|
* (append + replay + compact-on-rotate — see the backend in WarmNodeStore.cpp,
|
|
* link-guarded by nrf52840_s140_v7.ld). Everywhere else: /prefs/warm.dat.
|
|
*/
|
|
struct WarmNodeEntry {
|
|
NodeNum num; // 0 = empty slot
|
|
uint32_t last_heard; // recency for LRU ordering — see the metadata steal below
|
|
uint8_t public_key[32]; // all-zero = no key (a real key is never all-zero)
|
|
};
|
|
static_assert(sizeof(WarmNodeEntry) == 40, "WarmNodeEntry must stay 40 B — persistence format depends on it");
|
|
|
|
// Metadata packed into the low bits of last_heard.
|
|
//
|
|
// The warm tier only uses last_heard to LRU-rank evicted (long-tail) nodes, so ~minute
|
|
// recency resolution is plenty. We reclaim the low WARM_META_BITS of that field to carry
|
|
// the evicted node's device role + a protected category, at zero cost to record size
|
|
// (entry stays 40 B; no RAM/flash growth). The high bits remain a real unix-seconds
|
|
// timestamp quantised to (1 << WARM_META_BITS) seconds.
|
|
//
|
|
// Safe because: a real timestamp can never be all-ones (the tombstone sentinel) before
|
|
// 2106, and tombstones/erased flash are detected via num before last_heard is read. Only
|
|
// the LOW bits are stolen — the high (era) bits are untouched, so the time range is intact.
|
|
static constexpr uint32_t WARM_META_BITS = 6; // role(4) + protected(2)
|
|
static constexpr uint32_t WARM_META_MASK = (1u << WARM_META_BITS) - 1; // 0x3F → 64 s quantum
|
|
static constexpr uint32_t WARM_TIME_MASK = ~WARM_META_MASK; // 0xFFFFFFC0
|
|
static constexpr uint32_t WARM_ROLE_MASK = 0x0Fu; // bits [3:0] device role (0..12)
|
|
static constexpr uint32_t WARM_PROT_SHIFT = 4; // bits [5:4] protected category
|
|
static constexpr uint32_t WARM_PROT_MASK = 0x03u;
|
|
|
|
// Protected category cached alongside role so consumers needn't re-derive the mapping.
|
|
enum class WarmProtected : uint8_t { None = 0, Role = 1, Flag = 2 };
|
|
|
|
inline uint32_t warmPackLastHeard(uint32_t lastHeard, uint8_t role, uint8_t prot)
|
|
{
|
|
return (lastHeard & WARM_TIME_MASK) | (static_cast<uint32_t>(role) & WARM_ROLE_MASK) |
|
|
((static_cast<uint32_t>(prot) & WARM_PROT_MASK) << WARM_PROT_SHIFT);
|
|
}
|
|
inline uint32_t warmTimeOf(const WarmNodeEntry &e)
|
|
{
|
|
return e.last_heard & WARM_TIME_MASK;
|
|
}
|
|
inline uint8_t warmRoleOf(const WarmNodeEntry &e)
|
|
{
|
|
return static_cast<uint8_t>(e.last_heard & WARM_ROLE_MASK);
|
|
}
|
|
inline uint8_t warmProtOf(const WarmNodeEntry &e)
|
|
{
|
|
return static_cast<uint8_t>((e.last_heard >> WARM_PROT_SHIFT) & WARM_PROT_MASK);
|
|
}
|
|
|
|
// Gated on NRF52840_XXAA: the ring sits at 0xEA000
|
|
// valid only on the 1 MB-flash nRF52840.
|
|
#if defined(NRF52840_XXAA)
|
|
#define WARM_FLASH_PAGE_SIZE 4096u
|
|
#define WARM_FLASH_PAGES 3u
|
|
#define WARM_FLASH_REGION_BASE (0xED000u - WARM_FLASH_PAGES * WARM_FLASH_PAGE_SIZE) // 0xEA000
|
|
#define WARM_FLASH_PAGE_ADDR(i) (WARM_FLASH_REGION_BASE + (i)*WARM_FLASH_PAGE_SIZE)
|
|
#endif
|
|
|
|
class WarmNodeStore
|
|
{
|
|
public:
|
|
WarmNodeStore();
|
|
~WarmNodeStore();
|
|
WarmNodeStore(const WarmNodeStore &) = delete;
|
|
WarmNodeStore &operator=(const WarmNodeStore &) = delete;
|
|
|
|
/// Remember an evicted hot node. Keyless candidates never displace keyed
|
|
/// entries; otherwise the oldest (keyless-first) entry is replaced.
|
|
/// @param role the node's device role (meshtastic_Config_DeviceConfig_Role, 0..12)
|
|
/// @param protectedCat WarmProtected category cached for the hop-trim path
|
|
/// @return true if the node was stored or updated
|
|
bool absorb(NodeNum num, uint32_t lastHeard, const uint8_t *key32 /* may be NULL */, uint8_t role = 0,
|
|
uint8_t protectedCat = 0);
|
|
|
|
/// Look up the cached device role + protected category for a warm node.
|
|
/// @return false if the node is not in the warm tier.
|
|
bool lookupMeta(NodeNum num, uint8_t &role, uint8_t &protectedCat) const;
|
|
|
|
/// Find and remove an entry (used when the node is re-admitted to the hot store).
|
|
bool take(NodeNum num, WarmNodeEntry &out);
|
|
|
|
/// Copy the 32-byte public key for a node, if we have one.
|
|
bool copyKey(NodeNum num, uint8_t out[32]) const;
|
|
|
|
bool contains(NodeNum num) const;
|
|
void remove(NodeNum num);
|
|
void clear();
|
|
size_t count() const;
|
|
size_t capacity() const { return entries ? WARM_NODE_COUNT : 0; }
|
|
|
|
#if MESHTASTIC_NODEDB_MIGRATION_VERBOSE
|
|
/// Debug: dump every live warm entry (num / last_heard / has-key) to the
|
|
/// console. Compiled out unless MESHTASTIC_NODEDB_MIGRATION_VERBOSE.
|
|
void dumpToLog(const char *reason = "dump") const;
|
|
#endif
|
|
|
|
/// Load persisted entries (called once at boot, after the node DB loads).
|
|
void load();
|
|
/// Durability point, piggybacked on the node-database save cadence. On the
|
|
/// ring backend this flushes the shared flash page cache; on the file
|
|
/// backend it writes the warm.dat snapshot.
|
|
bool saveIfDirty();
|
|
|
|
private:
|
|
WarmNodeEntry *entries = nullptr; // WARM_NODE_COUNT slots; PSRAM on ESP32 when available
|
|
bool dirty = false;
|
|
|
|
WarmNodeEntry *find(NodeNum num) const;
|
|
// Internal slot-placement shared by absorb() and ring replay: applies the
|
|
// keyed-first admission policy without touching persistence.
|
|
WarmNodeEntry *place(NodeNum num, uint32_t lastHeard, const uint8_t *key32);
|
|
|
|
// Persistence hooks called from the mutation paths. File backend: mark
|
|
// dirty. Ring backend: append an upsert/tombstone record (+ mark dirty).
|
|
void persistEntry(const WarmNodeEntry &e); // e must point into entries[]
|
|
void persistRemove(NodeNum num, int storeSlot);
|
|
void persistClear();
|
|
|
|
#if defined(NRF52840_XXAA)
|
|
// nRF52840 raw-flash record-ring state.
|
|
struct WarmPageHeader {
|
|
uint32_t magic; // WARM_RING_MAGIC
|
|
uint32_t seq; // page generation; 0xFFFFFFFF = erased/unused
|
|
};
|
|
static_assert(sizeof(WarmPageHeader) == 8, "page header is part of the flash format");
|
|
static constexpr uint16_t kRecordsPerPage = (WARM_FLASH_PAGE_SIZE - sizeof(WarmPageHeader)) / sizeof(WarmNodeEntry); // 102
|
|
static_assert(WARM_NODE_COUNT <= 2 * ((WARM_FLASH_PAGE_SIZE - 8) / 40), "live set must fit the ring with one page reclaimed");
|
|
|
|
static constexpr uint8_t kNoPage = 0xFF; // "no page" sentinel for activePage / pageOf[]
|
|
|
|
uint8_t activePage = kNoPage; // no page opened yet (fresh/erased ring)
|
|
uint16_t writeSlot = 0; // next free record slot in the active page
|
|
uint32_t nextSeq = 1; // seq for the next page opened
|
|
uint8_t pageOf[WARM_NODE_COUNT]; // flash page holding each RAM slot's newest record; kNoPage = none
|
|
|
|
void ringAppend(const WarmNodeEntry &rec, int storeSlot /* -1 for tombstones */);
|
|
void ringRotate(); // reclaim oldest page, compacting stranded live entries
|
|
void ringOpenPage(uint8_t page); // erase + write header (seq = nextSeq++)
|
|
bool ringReadHeader(uint8_t page, WarmPageHeader &h, bool *legacy = nullptr) const;
|
|
#endif
|
|
|
|
bool save();
|
|
};
|
|
|
|
#endif // WARM_NODE_COUNT > 0
|