PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 04:04:16 +00:00
Code Issues Releases Activity

10 seconds max timeout for NTP

Browse Source
This commit is contained in:
orignal 2016-11-01 18:40:00 -04:00
parent 1ecd5250fc
commit d5e77e9bb2
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Timestamp.cpp
View File

@ -9,7 +9,7 @@ namespace i2p
{ {
namespace util namespace util
{ {
std::chrono::seconds g_TimeOffset (0); static int64_t g_TimeOffset = 0; // in seconds
void SyncTimeWithNTP (const std::string& address) void SyncTimeWithNTP (const std::string& address)
{ {
@ -31,17 +31,26 @@ namespace util
try try
{ {
socket.send_to (boost::asio::buffer (buf, 48), ep); socket.send_to (boost::asio::buffer (buf, 48), ep);
len = socket.receive_from (boost::asio::buffer (buf, 48), ep); int i = 0;
while (!socket.available() && i < 10) // 10 seconds max
{
std::this_thread::sleep_for (std::chrono::seconds(1));
i++;
}
if (socket.available ())
len = socket.receive_from (boost::asio::buffer (buf, 48), ep);
} }
catch (std::exception& e) catch (std::exception& e)
{ {
LogPrint (eLogError, "NTP error: ", e.what ());
} }
if (len >= 8) if (len >= 8)
{ {
auto ourTs = GetSecondsSinceEpoch ();
uint32_t ts = bufbe32toh (buf + 32); uint32_t ts = bufbe32toh (buf + 32);
if (ts > 2208988800U) ts -= 2208988800U; // 1/1/1970 from 1/1/1900 if (ts > 2208988800U) ts -= 2208988800U; // 1/1/1970 from 1/1/1900
g_TimeOffset = std::chrono::seconds(ts) - std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()); g_TimeOffset = ts - ourTs;
LogPrint (eLogInfo, address, " time offset from system time is ", g_TimeOffset.count (), " seconds"); LogPrint (eLogInfo, address, " time offset from system time is ", g_TimeOffset, " seconds");
} }
} }
} }

2
Timestamp.h
View File

@ -8,8 +8,6 @@ namespace i2p
{ {
namespace util namespace util
{ {
extern std::chrono::seconds g_TimeOffset;
inline uint64_t GetMillisecondsSinceEpoch () inline uint64_t GetMillisecondsSinceEpoch ()
{ {
return std::chrono::duration_cast<std::chrono::milliseconds>( return std::chrono::duration_cast<std::chrono::milliseconds>(