Skip to content

feat: add ability to force 32bit epoch time #4

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
milkpirate wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add ability to force 32bit epoch time #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion src/esp_date/date.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@
#warning "ESPDate detected 32-bit time_t; dates beyond 2038 may overflow."
#endif

#ifdef ESPDATE_FORCE_32BIT_EPOCH
#warning "ESPDate ESPDATE_FORCE_32BIT_EPOCH enabled; dates beyond 2038 may overflow."
// some implementations of time_t do not clear the upper bits when time_t is 64-bit and
// leave the upper bits garbage, which causes issues when the value is cast back to int64_t.
// NOTE: enableing this fix reintroduces the year 2038 problem.
#endif

using Utils = ESPDateUtils;

namespace {
Expand Down Expand Up @@ -69,6 +76,11 @@ void ESPDate::handleSntpSync(struct timeval *tv) {
if (tv) {
syncedEpoch = static_cast<int64_t>(tv->tv_sec);
}

#ifdef ESPDATE_FORCE_32BIT_EPOCH
syncedEpoch &= std::numeric_limits<uint32_t>::max();
#endif

const DateTime syncedAtUtc{syncedEpoch};
if (activeNtpSyncOwner_) {
activeNtpSyncOwner_->lastNtpSync_ = syncedAtUtc;
Expand Down Expand Up @@ -354,7 +366,13 @@ bool ESPDate::applyNtpConfig() const {
}

DateTime ESPDate::now() const {
return DateTime{static_cast<int64_t>(time(nullptr))};
auto epoch = static_cast<int64_t>(time(nullptr));

#ifdef ESPDATE_FORCE_32BIT_EPOCH
epoch &= std::numeric_limits<uint32_t>::max();
#endif

return DateTime{epoch};
}

DateTime ESPDate::nowUtc() const {
Expand Down