const int nServersCount = 147;
-std::string NtpServers[147] = {
+const std::string NtpServers[147] = {
// Microsoft
"time.windows.com",
// ... To be continued
};
-bool InitWithHost(std::string &strHostName, SOCKET &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr) {
+bool InitWithHost(const std::string &strHostName, SOCKET &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr) {
sockfd = -1;
std::vector<CNetAddr> vIP;
int len=48;
int retcode = sendto(sockfd, (char *) msg, len, 0, &cliaddr, servlen);
if (retcode < 0) {
- printf("sendto() failed: %d", retcode);
+ printf("sendto() failed: %d\n", retcode);
return -3;
}
retcode = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
if (retcode <= 0) {
- printf("recvfrom() error");
+ printf("recvfrom() error\n");
return -4;
}
return nTime;
}
-int64_t NtpGetTime(std::string &strHostName)
+int64_t NtpGetTime(const std::string &strHostName)
{
struct sockaddr cliaddr;
printf("Trying to find NTP server at localhost...\n");
- std::string strLocalHost = "127.0.0.1";
+ const std::string strLocalHost = "127.0.0.1";
if (NtpGetTime(strLocalHost) == GetTime()) {
printf("There is NTP server active at localhost, we don't need NTP thread.\n");
CMedianFilter<int64_t> vTimeOffsets(200,0);
while (!fShutdown) {
- if (strTrustedUpstream != "localhost") {
+ if (strTrustedUpstream != strLocalHost) {
// Trying to get new offset sample from trusted NTP server.
int64_t nClockOffset = NtpGetTime(strTrustedUpstream) - GetTime();
if (abs64(nClockOffset) < nMaxOffset) {
// Everything seems right, remember new trusted offset.
+ printf("ThreadNtpSamples: new offset sample from %s, offset=%" PRId64 ".\n", strTrustedUpstream.c_str(), nClockOffset);
nNtpOffset = nClockOffset;
}
else {
// Something went wrong, disable trusted offset sampling.
nNtpOffset = INT64_MAX;
- strTrustedUpstream = "localhost";
+ strTrustedUpstream = strLocalHost;
int nSleepMinutes = 1 + GetRandInt(9); // Sleep for 1-10 minutes.
for (int i = 0; i < nSleepMinutes * 60 && !fShutdown; i++)
int64_t nClockOffset = NtpGetTime(ip) - GetTime();
if (abs64(nClockOffset) < nMaxOffset) { // Skip the deliberately wrong timestamps
+ printf("ThreadNtpSamples: new offset sample from %s, offset=%" PRId64 ".\n", ip.ToString().c_str(), nClockOffset);
vTimeOffsets.input(nClockOffset);
}
}