#include "netbase.h"
#include "net.h"
-#include "util.h"
+//#include "util.h"
+#include "ui_interface.h"
extern int GetRandInt(int nMax);
uint8_t mac[5 * sizeof(uint32_t)]; /* mac */
};
-const int nServersCount = 147;
+const int nServersCount = 162;
-const std::string NtpServers[147] = {
+std::string NtpServers[162] = {
// Microsoft
"time.windows.com",
"ntp-03.caltech.edu",
"ntp-04.caltech.edu",
"nist1-pa.ustiming.org",
- "time-a.nist.gov ",
- "time-b.nist.gov ",
- "time-c.nist.gov ",
- "time-d.nist.gov ",
+ "time.nist.gov",
+ "time-a.nist.gov",
+ "time-b.nist.gov",
+ "time-c.nist.gov",
+ "time-d.nist.gov",
+ "time-nw.nist.gov",
"nist1-macon.macon.ga.us",
"nist.netservicesgroup.com",
"nisttime.carsoncity.k12.mi.us",
"time-a.timefreq.bldrdoc.gov",
"time-b.timefreq.bldrdoc.gov",
"time-c.timefreq.bldrdoc.gov",
- "time.nist.gov",
"utcnist.colorado.edu",
"utcnist2.colorado.edu",
"ntp-nist.ldsbc.net",
"1.us.pool.ntp.org",
"2.us.pool.ntp.org",
"3.us.pool.ntp.org",
+ "wwv.otc.psu.edu",
+ "otc1.psu.edu",
+ "otc2.psu.edu",
+ "now.okstate.edu",
+ "ntp.colby.edu",
+ "bonehed.lcs.mit.edu",
+ "ntp-s1.cise.ufl.edu",
// South Africa
"ntp1.meraka.csir.co.za",
"3.za.pool.ntp.org",
// Italy
+ "ntp0.ien.it",
+ "ntp1.ien.it",
+ "ntp2.ien.it",
"ntp1.inrim.it",
"ntp2.inrim.it",
"0.it.pool.ntp.org",
// Slovenia
"time.ijs.si",
+ // Austria
+ "0.at.pool.ntp.org",
+ "1.at.pool.ntp.org",
+ "2.at.pool.ntp.org",
+ "3.at.pool.ntp.org",
+
// ???
"clepsydra.dec.com",
// ... To be continued
};
-bool InitWithHost(const std::string &strHostName, SOCKET &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr) {
+bool InitWithHost(std::string &strHostName, SOCKET &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr) {
sockfd = -1;
std::vector<CNetAddr> vIP;
return nTime;
}
-int64_t NtpGetTime(const std::string &strHostName)
+int64_t NtpGetTime(std::string &strHostName)
{
struct sockaddr cliaddr;
}
void ThreadNtpSamples(void* parg) {
-
- // Maximum offset is 2 hours.
- const int64_t nMaxOffset = 7200;
+ const int64_t nMaxOffset = 86400; // Not a real limit, just sanity threshold.
printf("Trying to find NTP server at localhost...\n");
- const std::string strLocalHost = "127.0.0.1";
+ 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 != strLocalHost) {
+ if (strTrustedUpstream != "localhost") {
// Trying to get new offset sample from trusted NTP server.
int64_t nClockOffset = NtpGetTime(strTrustedUpstream) - GetTime();
else {
// Something went wrong, disable trusted offset sampling.
nNtpOffset = INT64_MAX;
- strTrustedUpstream = strLocalHost;
+ strTrustedUpstream = "localhost";
int nSleepMinutes = 1 + GetRandInt(9); // Sleep for 1-10 minutes.
for (int i = 0; i < nSleepMinutes * 60 && !fShutdown; i++)
}
}
- if (vTimeOffsets.size() > 2) {
+ if (vTimeOffsets.size() > 1) {
nNtpOffset = vTimeOffsets.median();
}
else {
- // Not enough offsets yet, try again later.
+ // Not enough offsets yet, try to collect additional samples later.
nNtpOffset = INT64_MAX;
int nSleepMinutes = 1 + GetRandInt(4); // Sleep for 1-5 minutes.
for (int i = 0; i < nSleepMinutes * 60 && !fShutdown; i++)
}
}
+ if (GetNodesOffset() == INT_MAX && abs64(nNtpOffset) > 40 * 60)
+ {
+ // If there is not enough node offsets data and NTP time offset is greater than 40 minutes then give a warning.
+ std::string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong NovaCoin will not work properly.");
+ strMiscWarning = strMessage;
+ printf("*** %s\n", strMessage.c_str());
+ uiInterface.ThreadSafeMessageBox(strMessage+" ", std::string("NovaCoin"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION);
+ }
+
printf("nNtpOffset = %+" PRId64 " (%+" PRId64 " minutes)\n", nNtpOffset, nNtpOffset/60);
int nSleepHours = 1 + GetRandInt(5); // Sleep for 1-6 hours.