X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fntp.cpp;h=bae50d936f01e60d58585a7f0e95294ab84b9b24;hb=cc25738918efa366be574377b971d437659e6e2a;hp=2ce65e1cd847e3921b8515ef8a27aa77e47b1151;hpb=0c15e9be384df1db22a714c3ec77e9902df0492f;p=novacoin.git

diff --git a/src/ntp.cpp b/src/ntp.cpp
index 2ce65e1..bae50d9 100644
--- a/src/ntp.cpp
+++ b/src/ntp.cpp
@@ -81,7 +81,7 @@ struct pkt {
 
 const int nServersCount = 147;
 
-std::string NtpServers[147] = {
+const std::string NtpServers[147] = {
     // Microsoft
     "time.windows.com",
 
@@ -262,7 +262,7 @@ std::string NtpServers[147] = {
     // ... 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;
@@ -348,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;
     }
 
@@ -359,7 +359,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 +391,7 @@ int64_t NtpGetTime(CNetAddr& ip) {
     return nTime;
 }
 
-int64_t NtpGetTime(std::string &strHostName)
+int64_t NtpGetTime(const std::string &strHostName)
 {
     struct sockaddr cliaddr;
 
@@ -424,6 +424,16 @@ void ThreadNtpSamples(void* parg) {
     // Maximum offset is 2 hours.
     const int64_t nMaxOffset = 7200;
 
+    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;
+    }
+
     printf("ThreadNtpSamples started\n");
     vnThreadsRunning[THREAD_NTP]++;
 
@@ -433,18 +443,19 @@ void ThreadNtpSamples(void* parg) {
     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++)
@@ -462,6 +473,7 @@ 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);
                 }
             }