Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix

Browse source
This commit is contained in:
Daniel Larimer 2014-06-12 18:40:12 -04:00
commit eab346121d
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/network/ntp.cpp
View file

@ -3,11 +3,8 @@
#include <fc/network/resolve.hpp>
#include <fc/network/ip.hpp>
#if defined(_WIN32)
# include <WinSock2.h> // for ntohl()
#elif defined(__linux__)
# include <arpa/inet.h>
#endif
#include <stdint.h>
#include "../byteswap.hpp"
#include <array>
@ -40,10 +37,17 @@ namespace fc
sock.send_to( (const char*)send_buf.data(), send_buf.size(), ntp_server );
fc::ip::endpoint from;
std::array<unsigned long, 1024> recv_buf;
std::array<uint64_t, 1024> recv_buf;
sock.receive_from( (char*)recv_buf.data(), recv_buf.size(), from );
return fc::time_point() + fc::seconds( ntohl((time_t)recv_buf[4]) - 2208988800U);
uint64_t receive_timestamp_net_order = recv_buf[4];
uint64_t receive_timestamp_host = bswap_64(receive_timestamp_net_order);
uint32_t fractional_seconds = receive_timestamp_host & 0xffffffff;
uint32_t microseconds = (uint32_t)(((((uint64_t)fractional_seconds) * 1000000) + (UINT64_C(1)<<31)) >> 32);
uint32_t seconds_since_1900 = receive_timestamp_host >> 32;
uint32_t seconds_since_epoch = seconds_since_1900 - 2208988800;
return fc::time_point() + fc::seconds(seconds_since_epoch) + fc::microseconds(microseconds);
}
}