DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* IdentityStore::save() was failing on RAK.

Browse Source 
* Repeater: CLI 'erase' command added.
This commit is contained in:
Scott Powell
2025-02-04 01:35:04 +11:00
parent a0bb332ce5
commit 29e62b9ce2
5 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/companion_radio/main.cpp
View File

@@ -388,7 +388,11 @@ public:
BaseChatMesh::begin(); BaseChatMesh::begin();
#if defined(NRF52_PLATFORM)
IdentityStore store(fs, "");
#else
IdentityStore store(fs, "/identity"); IdentityStore store(fs, "/identity");
#endif
if (!store.load("_main", self_id)) { if (!store.load("_main", self_id)) {
self_id = mesh::LocalIdentity(&trng); // create new random identity self_id = mesh::LocalIdentity(&trng); // create new random identity
store.save("_main", self_id); store.save("_main", self_id);

12
examples/simple_repeater/main.cpp
View File

@@ -498,6 +498,15 @@ public:
} else { } else {
sprintf(reply, "unknown config: %s", config); sprintf(reply, "unknown config: %s", config);
} }
} else if (sender_timestamp == 0 && strcmp(command, "erase") == 0) {
#if defined(NRF52_PLATFORM)
bool s = InternalFS.format();
#elif defined(ESP32)
bool s = SPIFFS.format();
#else
#error "need to implement file system erase"
#endif
sprintf(reply, "File system erase: %s", s ? "OK" : "Err");
} else if (memcmp(command, "ver", 3) == 0) { } else if (memcmp(command, "ver", 3) == 0) {
strcpy(reply, FIRMWARE_VER_TEXT); strcpy(reply, FIRMWARE_VER_TEXT);
} else { } else {
@@ -576,7 +585,7 @@ void setup() {
#if defined(NRF52_PLATFORM) #if defined(NRF52_PLATFORM)
InternalFS.begin(); InternalFS.begin();
fs = &InternalFS; fs = &InternalFS;
IdentityStore store(InternalFS, "/identity"); IdentityStore store(InternalFS, "");
#elif defined(ESP32) #elif defined(ESP32)
SPIFFS.begin(true); SPIFFS.begin(true);
fs = &SPIFFS; fs = &SPIFFS;
@@ -585,6 +594,7 @@ void setup() {
#error "need to define filesystem" #error "need to define filesystem"
#endif #endif
if (!store.load("_main", the_mesh.self_id)) { if (!store.load("_main", the_mesh.self_id)) {
MESH_DEBUG_PRINTLN("Generating new keypair");
RadioNoiseListener rng(radio); RadioNoiseListener rng(radio);
the_mesh.self_id = mesh::LocalIdentity(&rng); // create new random identity the_mesh.self_id = mesh::LocalIdentity(&rng); // create new random identity
store.save("_main", the_mesh.self_id); store.save("_main", the_mesh.self_id);

2
examples/simple_room_server/main.cpp
View File

@@ -727,7 +727,7 @@ void setup() {
#if defined(NRF52_PLATFORM) #if defined(NRF52_PLATFORM)
InternalFS.begin(); InternalFS.begin();
fs = &InternalFS; fs = &InternalFS;
IdentityStore store(InternalFS, "/identity"); IdentityStore store(InternalFS, "");
#elif defined(ESP32) #elif defined(ESP32)
SPIFFS.begin(true); SPIFFS.begin(true);
fs = &SPIFFS; fs = &SPIFFS;

4
examples/simple_secure_chat/main.cpp
View File

@@ -301,7 +301,11 @@ public:
BaseChatMesh::begin(); BaseChatMesh::begin();
#if defined(NRF52_PLATFORM)
IdentityStore store(fs, "");
#else
IdentityStore store(fs, "/identity"); IdentityStore store(fs, "/identity");
#endif
if (!store.load("_main", self_id, _prefs.node_name, sizeof(_prefs.node_name))) { // legacy: node_name was from identity file if (!store.load("_main", self_id, _prefs.node_name, sizeof(_prefs.node_name))) { // legacy: node_name was from identity file
self_id = mesh::LocalIdentity(getRNG()); // create new random identity self_id = mesh::LocalIdentity(getRNG()); // create new random identity
store.save("_main", self_id); store.save("_main", self_id);

4
src/helpers/IdentityStore.cpp
View File

@@ -45,10 +45,12 @@ bool IdentityStore::save(const char *name, const mesh::LocalIdentity& id) {
File file = _fs->open(filename, "w", true); File file = _fs->open(filename, "w", true);
#endif #endif
if (file) { if (file) {
id.writeTo(file); bool success = id.writeTo(file);
file.close(); file.close();
MESH_DEBUG_PRINTLN("IdentityStore::save() write - %s", success ? "OK" : "Err");
return true; return true;
} }
MESH_DEBUG_PRINTLN("IdentityStore::save() failed");
return false; return false;
} }