@@ -439,7 +439,7 @@ const TrafficManagementModule::NodeInfoPayloadEntry *TrafficManagementModule::fi
439439
440440// / Find or create a NodeInfo payload entry. Victim selection is trust-tiered so the cache
441441// / doubles as a pubkey pool: NodeDB membership outranks key trust, then keyless < TOFU key <
442- // / signer -proven key; within a tier the oldest observation loses (never-observed = oldest).
442+ // / key -proven key; within a tier the oldest observation loses (never-observed = oldest).
443443TrafficManagementModule::NodeInfoPayloadEntry *
444444TrafficManagementModule::findOrCreateNodeInfoEntry (NodeNum node, bool *usedEmptySlot, bool spareMembers)
445445{
@@ -466,7 +466,7 @@ TrafficManagementModule::findOrCreateNodeInfoEntry(NodeNum node, bool *usedEmpty
466466 }
467467 if (empty)
468468 continue ; // an empty slot beats any victim; stop scoring
469- // Eviction tier (lower loses first): 0 keyless, 1 TOFU key, 2 signer -proven key;
469+ // Eviction tier (lower loses first): 0 keyless, 1 TOFU key, 2 key -proven key;
470470 // +3 for NodeDB members - never shed a NodeDB-tier identity over a stranger.
471471 const uint8_t tier = static_cast <uint8_t >(((entry.user .public_key .size != 32 ) ? 0 : (entry.keyProven () ? 2 : 1 )) +
472472 (entry.isMember ? 3 : 0 ));
@@ -724,7 +724,7 @@ void TrafficManagementModule::onNodeKeyCommitted(NodeNum node, const uint8_t key
724724 // hasObserved/obsTick untouched: a key commit is knowledge, not an observation.
725725}
726726
727- bool TrafficManagementModule::copyPublicKey (NodeNum node, uint8_t out[32 ], bool *signerProven ) const
727+ bool TrafficManagementModule::copyPublicKey (NodeNum node, uint8_t out[32 ], bool *keyProven ) const
728728{
729729 // Same enable gate as the write-through hooks and maintenance: a disabled module stops
730730 // updating and sweeping the cache, so its frozen contents must not keep feeding PKI key
@@ -740,12 +740,12 @@ bool TrafficManagementModule::copyPublicKey(NodeNum node, uint8_t out[32], bool
740740 return false ;
741741
742742 memcpy (out, entry->user .public_key .bytes , 32 );
743- if (signerProven )
744- *signerProven = entry->keyProven ();
743+ if (keyProven )
744+ *keyProven = entry->keyProven ();
745745 return true ;
746746}
747747
748- bool TrafficManagementModule::copyUser (NodeNum node, meshtastic_User &out, bool *signerProven ) const
748+ bool TrafficManagementModule::copyUser (NodeNum node, meshtastic_User &out, bool *keyProven ) const
749749{
750750 // Enable gate, as in copyPublicKey(): a disabled module must not feed name rehydration
751751 // from frozen cache contents once its maintenance/write-through have stopped.
@@ -762,8 +762,8 @@ bool TrafficManagementModule::copyUser(NodeNum node, meshtastic_User &out, bool
762762 return false ;
763763
764764 out = entry->user ;
765- if (signerProven )
766- *signerProven = entry->keyProven ();
765+ if (keyProven )
766+ *keyProven = entry->keyProven ();
767767 return true ;
768768}
769769
@@ -1432,7 +1432,7 @@ bool TrafficManagementModule::shouldRespondToNodeInfo(const meshtastic_MeshPacke
14321432 uint8_t cachedObsTick = 0 ;
14331433 // Signer-proven provenance of the cached key, consumed by the replay gate below
14341434 // (maybe_unused: read only when TMM_NODEINFO_REPLAY_SIGNED_GATE is compiled in).
1435- [[maybe_unused]] bool cachedKeySignerProven = false ;
1435+ [[maybe_unused]] bool cachedKeyProven = false ;
14361436 // True once we commit to answering from the NodeDB fallback (no NodeInfo cache) path. The
14371437 // response throttle no longer distinguishes the paths - the per-requester/per-target RAM
14381438 // tables cover both - but the replay gate below still keys off it.
@@ -1449,7 +1449,7 @@ bool TrafficManagementModule::shouldRespondToNodeInfo(const meshtastic_MeshPacke
14491449 cachedSourceChannel = entry->sourceChannel ;
14501450 cachedHasObserved = entry->hasObserved ;
14511451 cachedObsTick = entry->obsTick ;
1452- cachedKeySignerProven = entry->keyProven ();
1452+ cachedKeyProven = entry->keyProven ();
14531453 }
14541454 }
14551455
@@ -1500,10 +1500,10 @@ bool TrafficManagementModule::shouldRespondToNodeInfo(const meshtastic_MeshPacke
15001500 }
15011501
15021502#if TMM_NODEINFO_REPLAY_SIGNED_GATE
1503- // Replay provenance gate (cache path): only spoof a reply for a signer -proven cached key.
1503+ // Replay provenance gate (cache path): only spoof a reply for a key -proven cached key.
15041504 // usedFallback entries were already gated above. See TMM_NODEINFO_REPLAY_REQUIRE_SIGNED.
1505- if (!usedFallback && !cachedKeySignerProven ) {
1506- TM_LOG_DEBUG (" NodeInfo cache entry for 0x%08x not signer -proven, not responding" , p->to );
1505+ if (!usedFallback && !cachedKeyProven ) {
1506+ TM_LOG_DEBUG (" NodeInfo cache entry for 0x%08x not key -proven, not responding" , p->to );
15071507 return false ;
15081508 }
15091509#endif
0 commit comments