* NodeDB: 3-tier node store with persistent warm tier (long-tail identity retention)
Introduces a tiered NodeDB so the device retains identity (public key,
last_heard) for far more nodes than fit in the full-record hot store,
without growing heap or the persisted nodes.proto unboundedly.
- Hot store: full NodeInfoLite, MAX_NUM_NODES (120 on nRF52).
- Satellite maps: position/telemetry/environment/status capped at
MAX_SATELLITE_NODES (40 freshest); eviction via enforceSatelliteCaps /
evictSatelliteOverCap.
- Warm tier (WarmNodeStore): 40 B {num,last_heard,public_key} records for
evicted nodes so DMs to/from long-tail nodes keep encrypting/decrypting.
Persisted to /prefs/warm.dat, or on nRF52840 a dedicated 12 KB raw-flash
record-ring below LittleFS (3x4 KB pages; see linker scripts + the
nrf52_warm_region.py post-link guard).
NodeDB::getOrCreateMeshNode now demotes evicted nodes into the warm tier and
re-admits them (restoring key/last_heard). Router PKI decrypt/encode resolve
the peer key via NodeDB::copyPublicKey (hot store, then warm tier).
NodeInfoLite gains snr_q4 (sint32, Q4-encoded dB); the float snr is zeroed on
disk. NodeInfoLite grows 105 -> 112 B; backup 2432 -> 2468 B.
Note: the snr_q4 .proto change still needs to land in the protobufs submodule
(generated header is updated here; submodule pointer left at upstream).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* NodeDB: robust receive + retention for blocked (ignored) nodes
Hardens how ignored/favourite nodes are received over admin and retained,
closing paths where a block could be lost or accidentally cleared.
- Blocking keeps the node's public key (admin set_ignored_node and
addFromContact no longer zero it / drop the warm-tier key), so a blocked
peer stays a verifiable identity.
- set_ignored_node creates the node if absent, so a block by node ID sticks
even for a node we've never heard from (e.g. pushed by a remote admin) with
no NodeInfo or key.
- Eviction protection (favourite/ignored/manually-verified) now also applies to
the load-time hot-store migration and is never undone by cleanupMeshDB, which
previously purged ignored nodes that lacked user info.
- The hot-store migration leaves our own node (index 0) in place and prefers to
demote non-protected nodes, like the runtime eviction scan.
Caps the protected set (favourite + ignored + verified) at MAX_NUM_NODES-2 via
NodeDB::setProtectedFlag(), so at least two evictable slots always remain and
getOrCreateMeshNode can always make room — replacing the previous unconditional
append that could run off the end of the node vector when every node was
protected. A locally-set favourite/ignore that hits the cap reports back to the
phone via a ClientNotification.
Adds test_nodedb_blocked covering the migration, favourite/ignored eviction
protection, ignored-survives-cleanup, and the protected-node cap. The
maintenance methods stay private in production; the test reaches them through a
PIO_UNIT_TESTING-guarded friend shim.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
# Conflicts:
# src/mesh/NodeDB.h
* fix copilot comments
* once again
* WarmNodeStore: fix cppcheck warnings (uninitvar, constVariablePointer)
Zero-initialise `stranded[]` and `seqs[]/order[]` VLAs so cppcheck can
verify there are no unguarded reads of uninitialised memory (the guards
exist but are not visible to static analysis). Mark two local pointers
`const` where the pointed-to entry is never mutated after assignment.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* self-care added to assist 2.7 and 2.8 nodedb migration
* Tidy warm-store/self-care: comments, guards, log + flash cleanup
Style/cleanup pass over the branch (no behavior change except the noted
preprocessor simplifications, which are semantically identical):
- Comments: move function descriptions to the headers, cap in-function
comments at ~3-4 lines, drop leading-number step markers, label stacked
#endif blocks, de-decorate banner comments.
- dumpToLog: fully gate decl + definition + AdminModule call site behind
MESHTASTIC_NODEDB_MIGRATION_VERBOSE so it compiles out when disabled
(~1.2 KB when off).
- mesh-pb-constants: drop the dead nRF52832 WARM_NODE_COUNT branch and trim
the macro docs.
- WarmNodeStore: simplify the redundant `ARCH_NRF52 && NRF52840_XXAA` guards
to `NRF52840_XXAA`, add a kNoPage sentinel for the ring page state.
- Shorten the always-on LOG_WARN strings (~120 B flash).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* more tidying up, aligning with docs and undoing other-arch regressions
* Update protobufs (#19)
Co-authored-by: NomDeTom <116762865+NomDeTom@users.noreply.github.com>
* made the migration pathway cleareer
* address copilot review
* fixed a copilot review on a downstream PR.
* Address Copilot review comments for PR #10705 (warmstore/nodedb)
- WarmNodeStore.h: default MIGRATION_VERBOSE to 0 (suppress info-level
chatter on production builds; opt in with =1)
- WarmNodeStore.cpp load(): move memset to top of function so all
failure paths (header-read fail, invalid header) leave entries clear
- WarmNodeStore.cpp save(): replace manual spiLock lock/unlock around
mkdir with LockGuard covering the full SafeFile sequence, matching
the lock discipline in load()
- Router.cpp: memcpy(&p->public_key.bytes, ...) -> memcpy(p->public_key.bytes,
...) — pass decayed uint8_t* rather than pointer-to-array
- AdminModule.cpp: check setProtectedFlag return for PKC auto-favorite;
log cap-refusal warning instead of unconditional "auto-favoriting"
- nrf52_warm_region.py: error message references both v6.ld and v7.ld
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* NodeDB: formatting cleanup (blank lines after preprocessor blocks)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* Lukewarm store
---------
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
212 lines
5.7 KiB
C++
212 lines
5.7 KiB
C++
// Unit tests for the warm ("long-tail") node tier — src/mesh/WarmNodeStore.cpp.
|
|
// Covers admission/eviction policy (keyed entries outrank keyless), take()
|
|
// rehydration semantics, and a tolerant persistence round trip.
|
|
#include "MeshTypes.h" // BEFORE TestUtil.h — provides WARM_NODE_COUNT via mesh-pb-constants.h
|
|
#include "TestUtil.h"
|
|
#include <unity.h>
|
|
|
|
#if defined(ARCH_PORTDUINO)
|
|
#define WS_TEST_ENTRY extern "C"
|
|
#else
|
|
#define WS_TEST_ENTRY
|
|
#endif
|
|
|
|
#if WARM_NODE_COUNT > 0
|
|
|
|
#include "mesh/WarmNodeStore.h"
|
|
#include <cstring>
|
|
|
|
namespace
|
|
{
|
|
|
|
void makeKey(uint8_t out[32], uint8_t seed)
|
|
{
|
|
memset(out, 0, 32);
|
|
out[0] = seed;
|
|
out[31] = seed ^ 0xA5;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
void setUp(void) {}
|
|
void tearDown(void) {}
|
|
|
|
void test_ws_absorb_and_copyKey_roundTrip()
|
|
{
|
|
WarmNodeStore ws;
|
|
uint8_t key[32], got[32];
|
|
makeKey(key, 7);
|
|
TEST_ASSERT_TRUE(ws.absorb(0x100, 1000, key));
|
|
TEST_ASSERT_TRUE(ws.contains(0x100));
|
|
TEST_ASSERT_TRUE(ws.copyKey(0x100, got));
|
|
TEST_ASSERT_EQUAL_MEMORY(key, got, 32);
|
|
TEST_ASSERT_EQUAL(1, ws.count());
|
|
}
|
|
|
|
void test_ws_keylessEntry_hasNoKey()
|
|
{
|
|
WarmNodeStore ws;
|
|
uint8_t got[32];
|
|
TEST_ASSERT_TRUE(ws.absorb(0x200, 1000, NULL));
|
|
TEST_ASSERT_TRUE(ws.contains(0x200));
|
|
TEST_ASSERT_FALSE(ws.copyKey(0x200, got));
|
|
}
|
|
|
|
void test_ws_absorb_rejectsNodeNumZero()
|
|
{
|
|
WarmNodeStore ws;
|
|
TEST_ASSERT_FALSE(ws.absorb(0, 1000, NULL));
|
|
TEST_ASSERT_EQUAL(0, ws.count());
|
|
}
|
|
|
|
void test_ws_absorb_updatesExistingEntry()
|
|
{
|
|
WarmNodeStore ws;
|
|
uint8_t key[32], got[32];
|
|
makeKey(key, 9);
|
|
TEST_ASSERT_TRUE(ws.absorb(0x300, 1000, NULL));
|
|
TEST_ASSERT_TRUE(ws.absorb(0x300, 2000, key)); // later eviction learned a key
|
|
TEST_ASSERT_EQUAL(1, ws.count());
|
|
TEST_ASSERT_TRUE(ws.copyKey(0x300, got));
|
|
TEST_ASSERT_EQUAL_MEMORY(key, got, 32);
|
|
}
|
|
|
|
void test_ws_take_removesEntry()
|
|
{
|
|
WarmNodeStore ws;
|
|
uint8_t key[32];
|
|
makeKey(key, 3);
|
|
ws.absorb(0x400, 1234, key);
|
|
|
|
WarmNodeEntry e;
|
|
TEST_ASSERT_TRUE(ws.take(0x400, e));
|
|
TEST_ASSERT_EQUAL(0x400, e.num);
|
|
TEST_ASSERT_EQUAL(1234, e.last_heard);
|
|
TEST_ASSERT_EQUAL_MEMORY(key, e.public_key, 32);
|
|
TEST_ASSERT_FALSE(ws.contains(0x400));
|
|
TEST_ASSERT_FALSE(ws.take(0x400, e));
|
|
TEST_ASSERT_EQUAL(0, ws.count());
|
|
}
|
|
|
|
void test_ws_keylessCandidate_neverEvictsKeyedEntries()
|
|
{
|
|
WarmNodeStore ws;
|
|
uint8_t key[32];
|
|
// Fill the store entirely with keyed entries
|
|
for (size_t i = 0; i < ws.capacity(); i++) {
|
|
makeKey(key, (uint8_t)i);
|
|
TEST_ASSERT_TRUE(ws.absorb(0x1000 + i, 100 + i, key));
|
|
}
|
|
TEST_ASSERT_EQUAL(ws.capacity(), ws.count());
|
|
// A keyless candidate (even a fresh one) must be rejected
|
|
TEST_ASSERT_FALSE(ws.absorb(0x9999, 999999, NULL));
|
|
TEST_ASSERT_FALSE(ws.contains(0x9999));
|
|
}
|
|
|
|
void test_ws_keyedCandidate_evictsOldestKeylessFirst()
|
|
{
|
|
WarmNodeStore ws;
|
|
uint8_t key[32];
|
|
makeKey(key, 0x42);
|
|
// Fill with keyed entries except two keyless ones in the middle
|
|
for (size_t i = 0; i < ws.capacity(); i++) {
|
|
const bool keyless = (i == 5 || i == 10);
|
|
TEST_ASSERT_TRUE(ws.absorb(0x1000 + i, keyless ? (i == 10 ? 50 : 60) : 10, keyless ? NULL : key));
|
|
}
|
|
// Keyed candidate must displace the OLDEST KEYLESS entry (0x100A, ts=50),
|
|
// even though every keyed entry is older (ts=10)
|
|
uint8_t k2[32];
|
|
makeKey(k2, 0x43);
|
|
TEST_ASSERT_TRUE(ws.absorb(0x8888, 70, k2));
|
|
TEST_ASSERT_FALSE(ws.contains(0x1000 + 10));
|
|
TEST_ASSERT_TRUE(ws.contains(0x1000 + 5));
|
|
TEST_ASSERT_TRUE(ws.contains(0x8888));
|
|
}
|
|
|
|
void test_ws_keyedCandidate_evictsOldestKeyedWhenNoKeyless()
|
|
{
|
|
WarmNodeStore ws;
|
|
uint8_t key[32];
|
|
for (size_t i = 0; i < ws.capacity(); i++) {
|
|
makeKey(key, (uint8_t)i);
|
|
TEST_ASSERT_TRUE(ws.absorb(0x1000 + i, 1000 + i, key)); // 0x1000 is the oldest
|
|
}
|
|
uint8_t k2[32];
|
|
makeKey(k2, 0x44);
|
|
TEST_ASSERT_TRUE(ws.absorb(0x7777, 999999, k2));
|
|
TEST_ASSERT_TRUE(ws.contains(0x7777));
|
|
TEST_ASSERT_FALSE(ws.contains(0x1000)); // oldest keyed evicted
|
|
TEST_ASSERT_EQUAL(ws.capacity(), ws.count());
|
|
}
|
|
|
|
void test_ws_remove_and_clear()
|
|
{
|
|
WarmNodeStore ws;
|
|
ws.absorb(0x500, 1, NULL);
|
|
ws.absorb(0x501, 2, NULL);
|
|
ws.remove(0x500);
|
|
TEST_ASSERT_FALSE(ws.contains(0x500));
|
|
TEST_ASSERT_EQUAL(1, ws.count());
|
|
ws.clear();
|
|
TEST_ASSERT_EQUAL(0, ws.count());
|
|
}
|
|
|
|
void test_ws_persistence_roundTrip()
|
|
{
|
|
WarmNodeStore a;
|
|
uint8_t key[32], got[32];
|
|
makeKey(key, 0x55);
|
|
a.absorb(0x600, 4242, key);
|
|
a.absorb(0x601, 4243, NULL);
|
|
if (!a.saveIfDirty()) {
|
|
TEST_IGNORE_MESSAGE("Filesystem not available in this test environment");
|
|
return;
|
|
}
|
|
|
|
WarmNodeStore b;
|
|
b.load();
|
|
TEST_ASSERT_TRUE(b.contains(0x600));
|
|
TEST_ASSERT_TRUE(b.contains(0x601));
|
|
TEST_ASSERT_TRUE(b.copyKey(0x600, got));
|
|
TEST_ASSERT_EQUAL_MEMORY(key, got, 32);
|
|
|
|
// Cleanup so reruns start fresh
|
|
b.clear();
|
|
b.saveIfDirty();
|
|
}
|
|
|
|
WS_TEST_ENTRY void setup()
|
|
{
|
|
initializeTestEnvironment();
|
|
UNITY_BEGIN();
|
|
RUN_TEST(test_ws_absorb_and_copyKey_roundTrip);
|
|
RUN_TEST(test_ws_keylessEntry_hasNoKey);
|
|
RUN_TEST(test_ws_absorb_rejectsNodeNumZero);
|
|
RUN_TEST(test_ws_absorb_updatesExistingEntry);
|
|
RUN_TEST(test_ws_take_removesEntry);
|
|
RUN_TEST(test_ws_keylessCandidate_neverEvictsKeyedEntries);
|
|
RUN_TEST(test_ws_keyedCandidate_evictsOldestKeylessFirst);
|
|
RUN_TEST(test_ws_keyedCandidate_evictsOldestKeyedWhenNoKeyless);
|
|
RUN_TEST(test_ws_remove_and_clear);
|
|
RUN_TEST(test_ws_persistence_roundTrip);
|
|
exit(UNITY_END());
|
|
}
|
|
|
|
WS_TEST_ENTRY void loop() {}
|
|
|
|
#else
|
|
|
|
void setUp(void) {}
|
|
void tearDown(void) {}
|
|
|
|
WS_TEST_ENTRY void setup()
|
|
{
|
|
initializeTestEnvironment();
|
|
UNITY_BEGIN();
|
|
exit(UNITY_END());
|
|
}
|
|
|
|
WS_TEST_ENTRY void loop() {}
|
|
|
|
#endif
|