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

* added RTCClock::getCurrentTimeUnique(), for when timestamps need to be unique (if temp rapid-fire)

Browse source
This commit is contained in:
Scott Powell 2025-02-19 17:24:25 +11:00
parent a115626afd
commit ba181da94a
4 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/simple_repeater/main.cpp
View file

@ -165,7 +165,7 @@ class MyMesh : public mesh::Mesh {
}
int handleRequest(ClientInfo* sender, uint8_t* payload, size_t payload_len) {
uint32_t now = getRTCClock()->getCurrentTime();
uint32_t now = getRTCClock()->getCurrentTimeUnique();
memcpy(reply_data, &now, 4); // response packets always prefixed with timestamp
switch (payload[0]) {
@ -333,7 +333,7 @@ protected:
client->last_timestamp = timestamp;
client->is_admin = is_admin;
uint32_t now = getRTCClock()->getCurrentTime();
uint32_t now = getRTCClock()->getCurrentTimeUnique();
memcpy(reply_data, &now, 4); // response packets always prefixed with timestamp
memcpy(&reply_data[4], "OK", 2);
@ -441,7 +441,7 @@ protected:
handleCommand(sender_timestamp, (const char *) &data[5], (char *) &temp[5]);
int text_len = strlen((char *) &temp[5]);
if (text_len > 0) {
uint32_t timestamp = getRTCClock()->getCurrentTime();
uint32_t timestamp = getRTCClock()->getCurrentTimeUnique();
if (timestamp == sender_timestamp) {
// WORKAROUND: the two timestamps need to be different, in the CLI view
timestamp++;

6
examples/simple_room_server/main.cpp
View file

@ -200,8 +200,7 @@ class MyMesh : public mesh::Mesh {
strncpy(posts[next_post_idx].text, postData, MAX_POST_TEXT_LEN);
posts[next_post_idx].text[MAX_POST_TEXT_LEN] = 0;
posts[next_post_idx].post_timestamp = getRTCClock()->getCurrentTime();
// TODO: only post at maximum of ONE PER SECOND, so that post_timestamps are UNIQUE!!
posts[next_post_idx].post_timestamp = getRTCClock()->getCurrentTimeUnique();
next_post_idx = (next_post_idx + 1) % MAX_UNSYNCED_POSTS;
next_push = futureMillis(PUSH_NOTIFY_DELAY_MILLIS);
@ -328,6 +327,7 @@ protected:
uint32_t now = getRTCClock()->getCurrentTime();
client->last_activity = now;
now = getRTCClock()->getCurrentTimeUnique();
memcpy(reply_data, &now, 4); // response packets always prefixed with timestamp
// TODO: maybe reply with count of messages waiting to be synced for THIS client?
reply_data[4] = RESP_SERVER_LOGIN_OK;
@ -393,7 +393,7 @@ protected:
} else if (sender_timestamp > client->last_timestamp) { // prevent replay attacks
client->last_timestamp = sender_timestamp;
uint32_t now = getRTCClock()->getCurrentTime();
uint32_t now = getRTCClock()->getCurrentTimeUnique();
client->last_activity = now;
client->push_failures = 0; // reset so push can resume (if prev failed)