Skip to content

Enable store and forward on default #6314

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
wants to merge 5 commits into
base: master
Choose a base branch
from
+3 −3
Open

Enable store and forward on default #6314

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d85b7f4
Enable store and forward on default
RCGV1 Mar 14, 2025
29959d0
Merge branch 'master' into StoreAndForwardAllowed
thebentern Mar 15, 2025
e6fee59
Fix: initializer the error text variable
RCGV1 Mar 16, 2025
74b3a9b
Merge branch 'master' into StoreAndForwardAllowed
RCGV1 Mar 19, 2025
9bde01b
Merge branch 'master' into StoreAndForwardAllowed
thebentern Mar 31, 2025
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
6 changes: 3 additions & 3 deletions src/modules/StoreForwardModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ void StoreForwardModule::sendErrorTextMessage(NodeNum dest, bool want_response)
if (this->busy) {
str = "S&F - Busy. Try again shortly.";
} else {
str = "S&F not permitted on the public channel.";
str = "S&F - Error. Channel not available.";
}
LOG_WARN("%s", str);
memcpy(pr->decoded.payload.bytes, str, strlen(str));
Expand Down Expand Up @@ -392,7 +392,7 @@ ProcessMessage StoreForwardModule::handleReceived(const meshtastic_MeshPacket &m
LOG_DEBUG("Legacy Request to send");

// Send the last 60 minutes of messages.
if (this->busy || channels.isDefaultChannel(mp.channel)) {
if (this->busy) {
sendErrorTextMessage(getFrom(&mp), mp.decoded.want_response);
} else {
storeForwardModule->historySend(historyReturnWindow * 60, getFrom(&mp));
Expand Down Expand Up @@ -457,7 +457,7 @@ bool StoreForwardModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp,
requests_history++;
LOG_INFO("Client Request to send HISTORY");
// Send the last 60 minutes of messages.
if (this->busy || channels.isDefaultChannel(mp.channel)) {
if (this->busy) {
sendErrorTextMessage(getFrom(&mp), mp.decoded.want_response);
} else {
if ((p->which_variant == meshtastic_StoreAndForward_history_tag) && (p->variant.history.window > 0)) {
Expand Down