rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-07 02:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc

Browse Source
This commit is contained in:
Jonathan Bennett
2025-12-26 00:03:21 -06:00
parent c911a8e3f1
commit df3934de85
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/Native/StoreForwardPlusPlus.cpp
View File

@@ -374,7 +374,7 @@ bool StoreForwardPlusPlusModule::handleReceivedProtobuf(const meshtastic_MeshPac
if (t->chain_count != 0 && t->root_hash.size >= 8) { if (t->chain_count != 0 && t->root_hash.size >= 8) {
link_object link_from_count = getLinkFromCount(t->chain_count, t->root_hash.bytes, t->root_hash.size); link_object link_from_count = getLinkFromCount(t->chain_count, t->root_hash.bytes, t->root_hash.size);
LOG_WARN("Count requested %d", t->chain_count); LOG_WARN("Count requested %d", t->chain_count);
broadcastLink(link_from_count); broadcastLink(link_from_count, true);
} else if (getNextHash(t->root_hash.bytes, t->root_hash.size, t->commit_hash.bytes, t->commit_hash.size, } else if (getNextHash(t->root_hash.bytes, t->root_hash.size, t->commit_hash.bytes, t->commit_hash.size,
next_commit_hash)) { next_commit_hash)) {
@@ -663,7 +663,7 @@ void StoreForwardPlusPlusModule::broadcastLink(uint8_t *_commit_hash, size_t _co
service->sendToMesh(p, RX_SRC_LOCAL, true); service->sendToMesh(p, RX_SRC_LOCAL, true);
} }
void StoreForwardPlusPlusModule::broadcastLink(link_object &lo) void StoreForwardPlusPlusModule::broadcastLink(link_object &lo, bool full_commit_hash)
{ {
meshtastic_StoreForwardPlusPlus storeforward = meshtastic_StoreForwardPlusPlus_init_zero; meshtastic_StoreForwardPlusPlus storeforward = meshtastic_StoreForwardPlusPlus_init_zero;
storeforward.sfpp_message_type = meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE; storeforward.sfpp_message_type = meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE;
@@ -680,7 +680,10 @@ void StoreForwardPlusPlusModule::broadcastLink(link_object &lo)
if (lo.commit_hash_len >= 8) { if (lo.commit_hash_len >= 8) {
// If we're sending a first link to a remote, that isn't actually the first on the chain // If we're sending a first link to a remote, that isn't actually the first on the chain
// it needs the full commit hash, as it can't regenerate it. // it needs the full commit hash, as it can't regenerate it.
storeforward.commit_hash.size = lo.commit_hash_len; if (full_commit_hash)
storeforward.commit_hash.size = lo.commit_hash_len;
else
storeforward.commit_hash.size = 8;
memcpy(storeforward.commit_hash.bytes, lo.commit_hash, storeforward.commit_hash.size); memcpy(storeforward.commit_hash.bytes, lo.commit_hash, storeforward.commit_hash.size);
} }
@@ -1059,7 +1062,7 @@ StoreForwardPlusPlusModule::link_object StoreForwardPlusPlusModule::ingestLinkMe
return lo; return lo;
} }
void StoreForwardPlusPlusModule::rebroadcastLinkObject(StoreForwardPlusPlusModule::link_object &lo) void StoreForwardPlusPlusModule::rebroadcastLinkObject(link_object &lo)
{ {
LOG_WARN("Attempting to Rebroadcast1"); LOG_WARN("Attempting to Rebroadcast1");
meshtastic_MeshPacket *p = router->allocForSending(); meshtastic_MeshPacket *p = router->allocForSending();

2
src/modules/Native/StoreForwardPlusPlus.h
View File

@@ -148,7 +148,7 @@ class StoreForwardPlusPlusModule : public ProtobufModule<meshtastic_StoreForward
void broadcastLink(uint8_t *, size_t); void broadcastLink(uint8_t *, size_t);
// sends a LINK_PROVIDE message broadcasting the given link object // sends a LINK_PROVIDE message broadcasting the given link object
void broadcastLink(link_object &); void broadcastLink(link_object &, bool);
// sends a LINK_PROVIDE message broadcasting the given link object from scratch message store // sends a LINK_PROVIDE message broadcasting the given link object from scratch message store
bool sendFromScratch(uint8_t *); bool sendFromScratch(uint8_t *);