#include "netbase.h"
#include "util.h"
+#include "net.h"
extern int GetRandInt(int nMax);
} l_fp;
-inline void Ntp2Unix(uint32_t &n, time_t &u)
-{
+inline void Ntp2Unix(uint32_t &n, time_t &u) {
// Ntp's time scale starts in 1900, Unix in 1970.
u = n - 0x83aa7e80; // 2208988800 1970 - 1900 in seconds
}
-inline void ntohl_fp(l_fp *n, l_fp *h)
-{
+inline void ntohl_fp(l_fp *n, l_fp *h) {
(h)->Ul_i.Xl_ui = ntohl((n)->Ul_i.Xl_ui);
(h)->Ul_f.Xl_uf = ntohl((n)->Ul_f.Xl_uf);
}
uint8_t mac[5 * sizeof(uint32_t)]; /* mac */
};
-int nServersCount = 107;
+int nServersCount = 118;
-std::string NtpServers[107] = {
+std::string NtpServers[118] = {
// Microsoft
"time.windows.com",
"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",
// ... 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<CNetAddr> 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);
-
- if (sockfd == INVALID_SOCKET)
- continue; // socket initialization error
-
- if (connect(sockfd, (struct sockaddr *) &servaddr, sizeof(servaddr)) == -1 )
- {
- continue; // "connection" error
- }
-
- *pcliaddr = *((struct sockaddr *) &servaddr);
- servlen = sizeof(servaddr);
- return true;
- }
-
- return false;
-}
-
-bool InitWithHost(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;
bool fRet = LookupHost(strHostName.c_str(), vIP, 10, true);
- if (!fRet)
+ if (!fRet) {
return false;
+ }
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)))
- {
+ for(unsigned int i = 0; i < vIP.size(); i++) {
+ if ((found = vIP[i].GetInAddr(&servaddr.sin_addr))) {
break;
}
}
- if (!found)
+ if (!found) {
return false;
+ }
sockfd = socket(AF_INET, SOCK_DGRAM, 0);
if (sockfd == INVALID_SOCKET)
return false; // socket initialization error
- if (connect(sockfd, (struct sockaddr *) &servaddr, sizeof(servaddr)) == -1 )
- {
+ if (connect(sockfd, (struct sockaddr *) &servaddr, sizeof(servaddr)) == -1 ) {
return false; // "connection" error
}
return true;
}
+bool InitWithRandom(SOCKET &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr) {
-int64_t DoReq(SOCKET sockfd, socklen_t servlen, struct sockaddr cliaddr)
-{
+ 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
u_long nOne = 1;
- if (ioctlsocket(sockfd, FIONBIO, &nOne) == SOCKET_ERROR)
- {
+ if (ioctlsocket(sockfd, FIONBIO, &nOne) == SOCKET_ERROR) {
printf("ConnectSocket() : ioctlsocket non-blocking setting failed, error %d\n", WSAGetLastError());
#else
- if (fcntl(sockfd, F_SETFL, O_NONBLOCK) == SOCKET_ERROR)
- {
+ if (fcntl(sockfd, F_SETFL, O_NONBLOCK) == SOCKET_ERROR) {
printf("ConnectSocket() : fcntl non-blocking setting failed, error %d\n", errno);
#endif
return -2;
}
fd_set fdset;
- struct timeval timeout = {5, 0};
+ struct timeval timeout = {10, 0};
FD_ZERO(&fdset);
FD_SET(sockfd, &fdset);
retcode = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
- if (retcode <= 0)
- {
+ if (retcode <= 0) {
printf("recvfrom() error");
return -4;
}
return (seconds_receive + seconds_transmit) / 2;
}
-int64_t NtpGetTime()
-{
+int64_t NtpGetTime(CNetAddr& ip) {
struct sockaddr cliaddr;
SOCKET sockfd;
if (!InitWithRandom(sockfd, servlen, &cliaddr))
return -1;
+ ip = CNetAddr(((sockaddr_in *)&cliaddr)->sin_addr);
int64_t nTime = DoReq(sockfd, servlen, cliaddr);
closesocket(sockfd);
return nTime;
}
-int64_t NtpGetTime(CNetAddr& ip)
+int64_t NtpGetTime(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);
return nTime;
}
-int64_t NtpGetTime(std::string &strHostName)
+void ThreadNtpSamples(void* parg)
{
- struct sockaddr cliaddr;
+ printf("ThreadNtpSamples started\n");
+ vnThreadsRunning[THREAD_NTP]++;
- SOCKET sockfd;
- socklen_t servlen;
+ // Make this thread recognisable as time synchronization thread
+ RenameThread("novacoin-ntp-samples");
- if (!InitWithHost(strHostName, sockfd, servlen, &cliaddr))
- return -1;
+ while (!fShutdown) {
+ CNetAddr ip;
+ int64_t nTime = NtpGetTime(ip);
- int64_t nTime = DoReq(sockfd, servlen, cliaddr);
+ if (nTime > 0 && nTime != 2085978496) { // Skip the deliberately wrong timestamps
+ AddTimeData(ip, nTime);
+ }
+ else {
+ Sleep(600000); // In case of failure wait 600 seconds and then try again
+ continue;
+ }
- closesocket(sockfd);
+ Sleep(43200000); // Sleep for 12 hours
+ }
- return nTime;
+ vnThreadsRunning[THREAD_NTP]--;
+ printf("ThreadNtpSamples exited\n");
}
git://git.novaco.in / novacoin.git / blobdiff