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

cleanups

Browse Source
This commit is contained in:
Jonathan Bennett
2025-12-15 22:46:26 -06:00
parent 82100f5f9d
commit 472c65178a
2 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,8 +158,6 @@ StoreForwardPlusPlusModule::StoreForwardPlusPlusModule()
sqlite3_prepare_v2(ppDb, "UPDATE channel_messages SET payload=? WHERE message_hash=?", -1, &updatePayloadStmt, NULL);
sqlite3_prepare_v2(ppDb, "SELECT payload from local_messages WHERE message_hash=?", -1, &getPayloadFromScratchStmt, NULL);
encryptedOk = true;
// wait about 15 seconds after boot for the first runOnce()
@@ -363,9 +361,9 @@ bool StoreForwardPlusPlusModule::handleReceivedProtobuf(const meshtastic_MeshPac
"", 0);
if (isInScratch(t->message_hash.bytes)) {
// TODO: Copy payload from scratch into chain
std::string payloadFromScratch = getPayloadFromScratch(t->message_hash.bytes);
if (payloadFromScratch != "") {
updatePayload(t->message_hash.bytes, payloadFromScratch.c_str(), payloadFromScratch.size());
link_object scratch_object = getFromScratch(t->message_hash.bytes, 32);
if (scratch_object.payload != "") {
updatePayload(t->message_hash.bytes, scratch_object.payload.c_str(), scratch_object.payload.size());
}
removeFromScratch(t->message_hash.bytes);
} else {
@@ -931,19 +929,6 @@ void StoreForwardPlusPlusModule::updatePayload(uint8_t *message_hash_bytes, cons
sqlite3_reset(updatePayloadStmt);
}
std::string StoreForwardPlusPlusModule::getPayloadFromScratch(uint8_t *message_hash_bytes)
{
LOG_WARN("getPayloadFromScratch");
sqlite3_bind_blob(getPayloadFromScratchStmt, 1, message_hash_bytes, 32, NULL);
auto res = sqlite3_step(getPayloadFromScratchStmt);
const char *_error_mesg = sqlite3_errmsg(ppDb);
LOG_WARN("step %u, %s", res, _error_mesg);
const char *tmp_text = (char *)sqlite3_column_text(getPayloadFromScratchStmt, 0);
size_t payload_len = sqlite3_column_bytes(getPayloadFromScratchStmt, 0);
std::string tmp_string(tmp_text, payload_len);
return tmp_string;
}
StoreForwardPlusPlusModule::link_object StoreForwardPlusPlusModule::getFromScratch(uint8_t *message_hash_bytes, size_t hash_len)
{

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

@@ -105,8 +105,6 @@ class StoreForwardPlusPlusModule : public ProtobufModule<meshtastic_StoreForward
void updatePayload(uint8_t *, const char *, size_t);
std::string getPayloadFromScratch(uint8_t *);
enum chain_types {
channel_chain = 0,
};