meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into rx_delay

Browse source 
# Conflicts:
#	examples/simple_repeater/main.cpp
#	examples/simple_room_server/main.cpp
This commit is contained in:
Scott Powell 2025-02-10 20:13:09 +11:00
commit 5d4a5dce36
2 changed files with 57 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

15
examples/simple_room_server/main.cpp
View file

@ -144,6 +144,7 @@ struct NodePrefs { // persisted to file
uint8_t unused;
float rx_delay_base;
float tx_delay_factor;
char guest_password[16];
};
class MyMesh : public mesh::Mesh {
@ -304,12 +305,11 @@ protected:
is_admin = true;
} else {
is_admin = false;
#ifdef ROOM_PASSWORD
if (memcmp(&data[8], ROOM_PASSWORD, strlen(ROOM_PASSWORD)) != 0) { // check the room/public password
int len = strlen(_prefs.guest_password);
if (len > 0 && memcmp(&data[8], _prefs.guest_password, len) != 0) { // check the room/public password
MESH_DEBUG_PRINTLN("Incorrect room password");
return; // no response. Client will timeout
}
#endif
}
auto client = putClient(sender); // add to known clients (if not already known)
@ -539,6 +539,10 @@ public:
_prefs.tx_power_dbm = LORA_TX_POWER;
_prefs.disable_fwd = 1;
_prefs.advert_interval = 2; // default to 2 minutes for NEW installs
#ifdef ROOM_PASSWORD
strncpy(_prefs.guest_password, ROOM_PASSWORD, sizeof(_prefs.guest_password)-1);
_prefs.guest_password[sizeof(_prefs.guest_password)-1] = 0; // truncate if necessary
#endif
num_clients = 0;
next_post_idx = 0;
@ -646,6 +650,11 @@ public:
savePrefs();
strcpy(reply, "OK");
}
} else if (memcmp(config, "guest.password ", 15) == 0) {
strncpy(_prefs.guest_password, &config[15], sizeof(_prefs.guest_password)-1);
_prefs.guest_password[sizeof(_prefs.guest_password)-1] = 0; // truncate if necessary
savePrefs();
strcpy(reply, "OK");
} else if (memcmp(config, "name ", 5) == 0) {
strncpy(_prefs.node_name, &config[5], sizeof(_prefs.node_name)-1);
_prefs.node_name[sizeof(_prefs.node_name)-1] = 0; // truncate if nec