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

* CommonCLI: added "set name ..." validation

Browse source 
* ANON_REQ_TYPE_VER_OWNER, now removes commas from node_name
This commit is contained in:
Scott Powell 2026-01-09 16:28:08 +11:00
parent fd69acb421
commit 65796c8f20
2 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
examples/simple_repeater/MyMesh.cpp
View file

@ -159,6 +159,14 @@ uint8_t MyMesh::handleAnonRegionsReq(const mesh::Identity& sender, uint32_t send
return 0;
}
static void sanitiseName(char* dest, const char* src) {
while (*src) {
*dest++ = (*src == ',') ? ' ' : *src;
src++;
}
*dest = 0;
}
uint8_t MyMesh::handleAnonVerOwnerReq(const mesh::Identity& sender, uint32_t sender_timestamp, const uint8_t* data) {
if (anon_limiter.allow(rtc_clock.getCurrentTime())) {
// request data has: {reply-path-len}{reply-path}
@ -166,10 +174,13 @@ uint8_t MyMesh::handleAnonVerOwnerReq(const mesh::Identity& sender, uint32_t sen
memcpy(reply_path, data, reply_path_len);
// data += reply_path_len;
char tmp[sizeof(_prefs.node_name)];
sanitiseName(tmp, _prefs.node_name);
memcpy(reply_data, &sender_timestamp, 4); // prefix with sender_timestamp, like a tag
uint32_t now = getRTCClock()->getCurrentTime();
memcpy(&reply_data[4], &now, 4); // include our clock (for easy clock sync, and packet hash uniqueness)
sprintf((char *) &reply_data[8], "%s,%s,%s", FIRMWARE_VERSION, _prefs.node_name, _prefs.owner_info);
sprintf((char *) &reply_data[8], "%s,%s,%s", FIRMWARE_VERSION, tmp, _prefs.owner_info);
return 8 + strlen((char *) &reply_data[8]); // reply length
}