Skip to content

Initialize persistent stores regardless of enable_transport #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wet-bulb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Initialize persistent stores regardless of enable_transport #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 43 additions & 39 deletions src/microReticulum/Transport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,63 +376,67 @@ DestinationEntry empty_destination_entry;
//p thread = threading.Thread(target=Transport.jobloop, daemon=True)
//p thread.start()

// Load transport-related data
if (Reticulum::transport_enabled()) {
INFO("Transport mode is enabled");

// Read in path table
//read_path_table();
// Load persistent data stores. Every instance needs an identity cache, a
// path table and a packet hashlist to address anything at all, so these
// are not gated on transport mode. Gated, Identity::remember() fails on
// every inbound announce and no path is ever added.
// Read in path table
//read_path_table();
#if defined(RNS_USE_FS) && RNS_PERSIST_PATHS
// CBA microStore
if (Utilities::OS::get_filesystem()) {
INFOF("FileSystem available: %lu bytes", Utilities::OS::get_filesystem().storageAvailable());
// CBA Must pass time offset into microStore for accurate timestamps on devices without a real-time clock
// CBA microStore
if (Utilities::OS::get_filesystem()) {
INFOF("FileSystem available: %lu bytes", Utilities::OS::get_filesystem().storageAvailable());
// CBA Must pass time offset into microStore for accurate timestamps on devices without a real-time clock
#if defined(ARDUINO)
microStore::set_time_offset(Utilities::OS::getTimeOffset() / 1000);
microStore::set_time_offset(Utilities::OS::getTimeOffset() / 1000);
#endif
TRACE("Initializing path table store...");
_path_store.init(Utilities::OS::get_filesystem(), "./path_store/", false, _path_store_segment_size, _path_store_segment_count);
// If the filesystem is full then clear the path store since it's of no use full anyway
if (Utilities::OS::get_filesystem().storageAvailable() > 0 && Utilities::OS::get_filesystem().storageAvailable() < 1024) {
WARNING("FileSystem is full, clearing existing path store");
_path_store.clear();
}
TRACE("Initializing path table store...");
_path_store.init(Utilities::OS::get_filesystem(), "./path_store/", false, _path_store_segment_size, _path_store_segment_count);
// If the filesystem is full then clear the path store since it's of no use full anyway
if (Utilities::OS::get_filesystem().storageAvailable() > 0 && Utilities::OS::get_filesystem().storageAvailable() < 1024) {
WARNING("FileSystem is full, clearing existing path store");
_path_store.clear();
}
}
#endif // RNS_USE_FS && RNS_PERSIST_PATHS

#if defined(RNS_USE_FS) && RNS_PERSIST_KNOWN_DESTINATIONS
if (Utilities::OS::get_filesystem()) {
// CBA Must pass time offset into microStore for accurate timestamps on devices without a real-time clock
if (Utilities::OS::get_filesystem()) {
// CBA Must pass time offset into microStore for accurate timestamps on devices without a real-time clock
#if defined(ARDUINO)
microStore::set_time_offset(Utilities::OS::getTimeOffset() / 1000);
microStore::set_time_offset(Utilities::OS::getTimeOffset() / 1000);
#endif
TRACE("Initializing known destinations store...");
Identity::_known_store.init(Utilities::OS::get_filesystem(), "./known_store/", false,
Identity::_known_store_segment_size, Identity::_known_store_segment_count);
if (Utilities::OS::get_filesystem().storageAvailable() > 0 && Utilities::OS::get_filesystem().storageAvailable() < 1024) {
WARNING("FileSystem is full, clearing existing known destinations store");
Identity::_known_store.clear();
}
TRACE("Initializing known destinations store...");
Identity::_known_store.init(Utilities::OS::get_filesystem(), "./known_store/", false,
Identity::_known_store_segment_size, Identity::_known_store_segment_count);
if (Utilities::OS::get_filesystem().storageAvailable() > 0 && Utilities::OS::get_filesystem().storageAvailable() < 1024) {
WARNING("FileSystem is full, clearing existing known destinations store");
Identity::_known_store.clear();
}
}
#endif // RNS_USE_FS && RNS_PERSIST_KNOWN_DESTINATIONS
Identity::_known_store.set_max_recs(Identity::_known_destinations_maxsize);
Identity::_known_store.set_max_recs(Identity::_known_destinations_maxsize);

#if defined(RNS_USE_FS) && RNS_PERSIST_HASHLIST
if (Utilities::OS::get_filesystem()) {
// CBA Must pass time offset into microStore for accurate timestamps on devices without a real-time clock
if (Utilities::OS::get_filesystem()) {
// CBA Must pass time offset into microStore for accurate timestamps on devices without a real-time clock
#if defined(ARDUINO)
microStore::set_time_offset(Utilities::OS::getTimeOffset() / 1000);
microStore::set_time_offset(Utilities::OS::getTimeOffset() / 1000);
#endif
TRACE("Initializing packet hashlist store...");
_packet_hash_store.init(Utilities::OS::get_filesystem(), "./hashlist_store/", false,
_hashlist_segment_size, _hashlist_segment_count);
if (Utilities::OS::get_filesystem().storageAvailable() > 0 && Utilities::OS::get_filesystem().storageAvailable() < 1024) {
WARNING("FileSystem is full, clearing existing packet hashlist store");
_packet_hash_store.clear();
}
TRACE("Initializing packet hashlist store...");
_packet_hash_store.init(Utilities::OS::get_filesystem(), "./hashlist_store/", false,
_hashlist_segment_size, _hashlist_segment_count);
if (Utilities::OS::get_filesystem().storageAvailable() > 0 && Utilities::OS::get_filesystem().storageAvailable() < 1024) {
WARNING("FileSystem is full, clearing existing packet hashlist store");
_packet_hash_store.clear();
}
}
#endif // RNS_USE_FS && RNS_PERSIST_HASHLIST

// Load transport-related data
if (Reticulum::transport_enabled()) {
INFO("Transport mode is enabled");

// CBA The following write and clean is very resource intensive so skip at startup
// and let a later (optimized) scheduled write and clean take care of it.
// Write path table back and clean caches in case any entries are invalid
Expand Down