Keep old GetAdjustedTime() behavior if no NTP data is available;

[novacoin.git] / src / ntp.cpp

diff --git a/src/ntp.cpp b/src/ntp.cpp
index c46991e..4cc422b 100644 (file)
--- a/src/ntp.cpp
+++ b/src/ntp.cpp
@@ -13,7 +13,8 @@
 
 #include "netbase.h"
 #include "net.h"
-#include "util.h"
+//#include "util.h"
+#include "ui_interface.h"
 
 extern int GetRandInt(int nMax);
 
@@ -81,7 +82,7 @@ struct pkt {
 
 const int nServersCount = 147;
 
-const std::string NtpServers[147] = {
+std::string NtpServers[147] = {
     // Microsoft
     "time.windows.com",
 
@@ -262,7 +263,7 @@ const std::string NtpServers[147] = {
     // ... 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;
@@ -348,7 +349,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;
     }
 
@@ -359,7 +360,7 @@ 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;
     }
 
@@ -391,7 +392,7 @@ int64_t NtpGetTime(CNetAddr& ip) {
     return nTime;
 }
 
-int64_t NtpGetTime(const std::string &strHostName)
+int64_t NtpGetTime(std::string &strHostName)
 {
     struct sockaddr cliaddr;
 
@@ -420,13 +421,11 @@ int64_t GetNtpOffset() {
 }
 
 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");
 
@@ -443,18 +442,19 @@ void ThreadNtpSamples(void* parg) {
     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();
 
             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;
+                strTrustedUpstream = "localhost";
 
                 int nSleepMinutes = 1 + GetRandInt(9); // Sleep for 1-10 minutes.
                 for (int i = 0; i < nSleepMinutes * 60 && !fShutdown; i++)
@@ -472,15 +472,16 @@ void ThreadNtpSamples(void* parg) {
                 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) {
+            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++) 
@@ -489,6 +490,15 @@ void ThreadNtpSamples(void* parg) {
             }
         }
 
+        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.