From 0f34261fab265699837cd7c90fb964bf0bf4e162 Mon Sep 17 00:00:00 2001 From: Maxim Prokhorov Date: Wed, 8 Dec 2021 13:21:25 +0300 Subject: [PATCH] web: use internal millis() call --- code/espurna/web.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/code/espurna/web.cpp b/code/espurna/web.cpp index 694026f4..c9e5f71d 100644 --- a/code/espurna/web.cpp +++ b/code/espurna/web.cpp @@ -299,12 +299,6 @@ void _onGetConfig(AsyncWebServerRequest *request) { *out += "\n}"; auto hostname = getHostname(); - auto timestamp = String(millis()); -#if NTP_SUPPORT - if (ntpSynced()) { - timestamp = ntpDateTime(); - } -#endif AsyncWebServerResponse* response = request->beginChunkedResponse("application/json", [out](uint8_t* buffer, size_t maxLen, size_t index) -> size_t { @@ -322,8 +316,19 @@ void _onGetConfig(AsyncWebServerRequest *request) { return have; }); + auto get_timestamp = []() -> String { +#if NTP_SUPPORT + if (ntpSynced()) { + return ntpDateTime(); + } +#endif + return String(espurna::time::millis().time_since_epoch().count(), 10); + }; + int written = snprintf_P(buffer, sizeof(buffer), - PSTR("attachment; filename=\"%s %s backup.json\""), hostname.c_str(), timestamp.c_str()); + PSTR("attachment; filename=\"%s %s backup.json\""), + hostname.c_str(), get_timestamp().c_str()); + if (written > 0) { response->addHeader("Content-Disposition", buffer); response->addHeader("X-XSS-Protection", "1; mode=block");