Green-Sky/solanaceae_zox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

discard syncs into the future

Browse Source
This commit is contained in:
Green Sky 2023-12-22 15:01:57 +01:00
parent 0db92dd70c
commit 5b39e85697
No known key found for this signature in database
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
solanaceae/zox/ngc_hs.cpp
View File

@ -255,7 +255,7 @@ bool ZoxNGCHistorySync::onEvent(const Events::ZoxNGC_ngch_request& e) {
// convert sync delta to ms // convert sync delta to ms
const int64_t sync_delta_offset_ms = int64_t(e.sync_delta) * 1000 * 60; const int64_t sync_delta_offset_ms = int64_t(e.sync_delta) * 1000 * 60;
const uint64_t ts_start = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count() - sync_delta_offset_ms; const uint64_t ts_start = Message::getTimeMS() - sync_delta_offset_ms;
auto view = reg.view<Message::Components::ContactFrom, Message::Components::ContactTo, Message::Components::Timestamp, Message::Components::MessageText, Message::Components::ToxGroupMessageID>(); auto view = reg.view<Message::Components::ContactFrom, Message::Components::ContactTo, Message::Components::Timestamp, Message::Components::MessageText, Message::Components::ToxGroupMessageID>();
view.use<Message::Components::Timestamp>(); view.use<Message::Components::Timestamp>();
@ -337,7 +337,14 @@ bool ZoxNGCHistorySync::onEvent(const Events::ZoxNGC_ngch_syncmsg& e) {
// convert to ms // convert to ms
uint64_t sync_ts = std::chrono::milliseconds(std::chrono::seconds{e.timestamp}).count(); // o.o uint64_t sync_ts = std::chrono::milliseconds(std::chrono::seconds{e.timestamp}).count(); // o.o
uint64_t now_ts = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(); uint64_t now_ts = Message::getTimeMS();
const uint64_t max_future_ms = 1u*60u*1000u; // accept up to 1 minute into the future
if (sync_ts - max_future_ms > now_ts) {
// message is too far into the future
std::cerr << "ZNGCHS error: message ts was too far into the future\n";
return true; // false? keep handled?
}
// find matches // find matches
Message3 matching_e = entt::null; Message3 matching_e = entt::null;