X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fntp.cpp;h=bae50d936f01e60d58585a7f0e95294ab84b9b24;hb=cc25738918efa366be574377b971d437659e6e2a;hp=35d6a73721a3d8ef5ea42f5c3ad53f4ac466a02b;hpb=9de5ff869fb469db2d821f4ecfda44657259ec26;p=novacoin.git diff --git a/src/ntp.cpp b/src/ntp.cpp index 35d6a73..bae50d9 100644 --- a/src/ntp.cpp +++ b/src/ntp.cpp @@ -1,4 +1,3 @@ - #ifdef WIN32 #include #else @@ -13,8 +12,8 @@ #endif #include "netbase.h" -#include "util.h" #include "net.h" +#include "util.h" extern int GetRandInt(int nMax); @@ -80,9 +79,9 @@ struct pkt { uint8_t mac[5 * sizeof(uint32_t)]; /* mac */ }; -int nServersCount = 107; +const int nServersCount = 147; -std::string NtpServers[107] = { +const std::string NtpServers[147] = { // Microsoft "time.windows.com", @@ -92,7 +91,22 @@ std::string NtpServers[107] = { "time3.google.com", "time4.google.com", + // Hurricane Electric + "clock.sjc.he.net", + "clock.nyc.he.net", + + // SixXS + "ntp.sixxs.net", + "ntp.eu.sixxs.net", + "ntp.us.sixxs.net", + "ntp.ap.sixxs.net", + // Russian Federation + "ntp.karelia.pro", + "ntp.alpet.me", + "aviel.alpet.me", + "ntp.sampo.ru", + "ntp.szt.ru", "ntp.ix.ru", "ntp1.stratum2.ru", "ntp2.stratum2.ru", @@ -122,6 +136,15 @@ std::string NtpServers[107] = { "3.ru.pool.ntp.org", // United States + "tock.cs.unlv.edu", + "timex.cs.columbia.edu", + "tick.cs.unlv.edu", + "sundial.columbia.edu", + "ntp-1.ece.cmu.edu", + "ntp-2.ece.cmu.edu", + "ntp1.cs.wisc.edu", + "ntp2.cs.wisc.edu", + "ntp3.cs.wisc.edu", "ntp-01.caltech.edu", "ntp-02.caltech.edu", "ntp-03.caltech.edu", @@ -193,6 +216,7 @@ std::string NtpServers[107] = { // United Kingdom "ntp2d.mcc.ac.uk", "ntp2c.mcc.ac.uk", + "ntp2b.mcc.ac.uk", "ntp.exnet.com", "ntp.cis.strath.ac.uk", "ntppub.le.ac.uk", @@ -201,6 +225,19 @@ std::string NtpServers[107] = { "2.uk.pool.ntp.org", "3.uk.pool.ntp.org", + // Canada + "chime.utoronto.ca", + "tick.utoronto.ca", + "time.nrc.ca", + "timelord.uregina.ca", + "tock.utoronto.ca", + "www1.cmc.ec.gc.ca", + "www2.cmc.ec.gc.ca", + "0.ca.pool.ntp.org", + "1.ca.pool.ntp.org", + "2.ca.pool.ntp.org", + "3.ca.pool.ntp.org", + // Japan "ntp.nict.jp", "0.jp.pool.ntp.org", @@ -208,55 +245,24 @@ std::string NtpServers[107] = { "2.jp.pool.ntp.org", "3.jp.pool.ntp.org", - // ... To be continued -}; - -bool InitWithRandom(SOCKET &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr) { - int nAttempt = 0; - - while(nAttempt < 100) { - sockfd = -1; - nAttempt++; - - int nServerNum = GetRandInt(nServersCount); - - std::vector vIP; - bool fRet = LookupHost(NtpServers[nServerNum].c_str(), vIP, 10, true); - if (!fRet) - continue; - - struct sockaddr_in servaddr; - servaddr.sin_family = AF_INET; - servaddr.sin_port = htons(123); - - bool found = false; - for(unsigned int i = 0; i < vIP.size(); i++) { - if ((found = vIP[i].GetInAddr(&servaddr.sin_addr))) { - break; - } - } - - if (!found) - continue; - - sockfd = socket(AF_INET, SOCK_DGRAM, 0); + // Australia + "ntp.cs.mu.oz.au", + "augean.eleceng.adelaide.edu.au", + "0.au.pool.ntp.org", + "1.au.pool.ntp.org", + "2.au.pool.ntp.org", + "3.au.pool.ntp.org", - if (sockfd == INVALID_SOCKET) - continue; // socket initialization error + // Slovenia + "time.ijs.si", - if (connect(sockfd, (struct sockaddr *) &servaddr, sizeof(servaddr)) == -1 ) { - continue; // "connection" error - } - - *pcliaddr = *((struct sockaddr *) &servaddr); - servlen = sizeof(servaddr); - return true; - } + // ??? + "clepsydra.dec.com", - return false; -} + // ... 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 vIP; @@ -296,6 +302,17 @@ bool InitWithHost(std::string &strHostName, SOCKET &sockfd, socklen_t &servlen, return true; } +bool InitWithRandom(SOCKET &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr) { + + for (int nAttempt = 0; nAttempt < nServersCount; nAttempt++) { + int nServerNum = GetRandInt(nServersCount); + if (InitWithHost(NtpServers[nServerNum], sockfd, servlen, pcliaddr)) { + return true; + } + } + + return false; +} int64_t DoReq(SOCKET sockfd, socklen_t servlen, struct sockaddr cliaddr) { #ifdef WIN32 @@ -331,7 +348,7 @@ int64_t DoReq(SOCKET sockfd, socklen_t servlen, struct sockaddr cliaddr) { 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; } @@ -342,28 +359,22 @@ int64_t DoReq(SOCKET sockfd, socklen_t servlen, struct sockaddr cliaddr) { retcode = select(sockfd + 1, &fdset, NULL, NULL, &timeout); if (retcode <= 0) { - printf("recvfrom() error"); + printf("recvfrom() error\n"); return -4; } recvfrom(sockfd, (char *) msg, len, 0, NULL, NULL); - - ntohl_fp(&msg->rec, &prt->rec); ntohl_fp(&msg->xmt, &prt->xmt); - - time_t seconds_receive; time_t seconds_transmit; - - Ntp2Unix(prt->rec.Ul_i.Xl_ui, seconds_receive); Ntp2Unix(prt->xmt.Ul_i.Xl_ui, seconds_transmit); delete msg; delete prt; - return (seconds_receive + seconds_transmit) / 2; + return seconds_transmit; } -int64_t NtpGetTime() { +int64_t NtpGetTime(CNetAddr& ip) { struct sockaddr cliaddr; SOCKET sockfd; @@ -372,6 +383,7 @@ int64_t NtpGetTime() { if (!InitWithRandom(sockfd, servlen, &cliaddr)) return -1; + ip = CNetAddr(((sockaddr_in *)&cliaddr)->sin_addr); int64_t nTime = DoReq(sockfd, servlen, cliaddr); closesocket(sockfd); @@ -379,16 +391,16 @@ int64_t NtpGetTime() { return nTime; } -int64_t NtpGetTime(CNetAddr& ip) { +int64_t NtpGetTime(const std::string &strHostName) +{ struct sockaddr cliaddr; SOCKET sockfd; socklen_t servlen; - if (!InitWithRandom(sockfd, servlen, &cliaddr)) + if (!InitWithHost(strHostName, sockfd, servlen, &cliaddr)) return -1; - ip = CNetAddr(((sockaddr_in *)&cliaddr)->sin_addr); int64_t nTime = DoReq(sockfd, servlen, cliaddr); closesocket(sockfd); @@ -396,44 +408,94 @@ int64_t NtpGetTime(CNetAddr& ip) { return nTime; } -int64_t NtpGetTime(std::string &strHostName) -{ - struct sockaddr cliaddr; +// NTP server, which we unconditionally trust. This may be your own installation of ntpd somewhere, for example. +// "localhost" means "trust no one" +std::string strTrustedUpstream = "localhost"; - SOCKET sockfd; - socklen_t servlen; +// Current offset +int64_t nNtpOffset = INT64_MAX; - if (!InitWithHost(strHostName, sockfd, servlen, &cliaddr)) - return -1; +int64_t GetNtpOffset() { + return nNtpOffset; +} - int64_t nTime = DoReq(sockfd, servlen, cliaddr); +void ThreadNtpSamples(void* parg) { - closesocket(sockfd); + // Maximum offset is 2 hours. + const int64_t nMaxOffset = 7200; - return nTime; -} + printf("Trying to find NTP server at localhost...\n"); + + 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"); + + nNtpOffset = 0; + return; + } -void ThreadNtpSamples(void* parg) -{ printf("ThreadNtpSamples started\n"); vnThreadsRunning[THREAD_NTP]++; // Make this thread recognisable as time synchronization thread RenameThread("novacoin-ntp-samples"); + CMedianFilter vTimeOffsets(200,0); + while (!fShutdown) { - CNetAddr ip; - int64_t nTime = NtpGetTime(ip); + 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 = strLocalHost; + + int nSleepMinutes = 1 + GetRandInt(9); // Sleep for 1-10 minutes. + for (int i = 0; i < nSleepMinutes * 60 && !fShutdown; i++) + Sleep(1000); - if (nTime > 0 && nTime != 2085978496) { // Skip the deliberately wrong timestamps - AddTimeData(ip, nTime); + continue; + } } else { - Sleep(600000); // In case of failure wait 600 seconds and then try again - continue; + // Now, trying to get 2-4 samples from random NTP servers. + int nSamplesCount = 2 + GetRandInt(2); + + for (int i = 0; i < nSamplesCount; i++) { + CNetAddr ip; + 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); + } + } + + if (vTimeOffsets.size() > 2) { + nNtpOffset = vTimeOffsets.median(); + } + else { + // Not enough offsets yet, try again later. + nNtpOffset = INT64_MAX; + int nSleepMinutes = 1 + GetRandInt(4); // Sleep for 1-5 minutes. + for (int i = 0; i < nSleepMinutes * 60 && !fShutdown; i++) + Sleep(1000); + continue; + } } - Sleep(43200000); // Sleep for 12 hours + printf("nNtpOffset = %+" PRId64 " (%+" PRId64 " minutes)\n", nNtpOffset, nNtpOffset/60); + + int nSleepHours = 1 + GetRandInt(5); // Sleep for 1-6 hours. + for (int i = 0; i < nSleepHours * 3600 && !fShutdown; i++) + Sleep(1000); } vnThreadsRunning[THREAD_NTP]--;