-#ifdef WIN32
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#endif
#ifndef WIN32
#include <unistd.h>
#endif
#include "netbase.h"
#include "net.h"
-//#include "util.h"
#include "ui_interface.h"
extern int GetRandInt(int nMax);
} l_fp;
-inline void Ntp2Unix(uint32_t &n, time_t &u) {
+inline void Ntp2Unix(const uint32_t &n, time_t &u) {
// Ntp's time scale starts in 1900, Unix in 1970.
u = n - 0x83aa7e80; // 2208988800 1970 - 1900 in seconds
// ... To be continued
};
-bool InitWithHost(std::string &strHostName, SOCKET &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr) {
- sockfd = -1;
+bool InitWithHost(const std::string &strHostName, SOCKET &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr) {
+
+ sockfd = INVALID_SOCKET;
std::vector<CNetAddr> vIP;
- bool fRet = LookupHost(strHostName.c_str(), vIP, 10, true);
+ bool fRet = LookupHost(strHostName, vIP, 10, true);
if (!fRet) {
return false;
}
- struct sockaddr_in servaddr;
+ 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))) {
+ if ((found = vIP[i].GetInAddr(&servaddr.sin_addr)) != false) {
break;
}
}
}
int64_t DoReq(SOCKET sockfd, socklen_t servlen, struct sockaddr cliaddr) {
+
+
#ifdef WIN32
u_long nOne = 1;
if (ioctlsocket(sockfd, FIONBIO, &nOne) == SOCKET_ERROR) {
return -2;
}
+ struct timeval timeout = {10, 0};
struct pkt *msg = new pkt;
struct pkt *prt = new pkt;
+ time_t seconds_transmit;
+ int len = 48;
msg->li_vn_mode=227;
msg->stratum=0;
msg->xmt.Ul_i.Xl_i=0;
msg->xmt.Ul_f.Xl_f=0;
- int len=48;
int retcode = sendto(sockfd, (char *) msg, len, 0, &cliaddr, servlen);
if (retcode < 0) {
printf("sendto() failed: %d\n", retcode);
- return -3;
+ seconds_transmit = -3;
+ goto _end;
}
fd_set fdset;
- struct timeval timeout = {10, 0};
FD_ZERO(&fdset);
FD_SET(sockfd, &fdset);
retcode = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
if (retcode <= 0) {
printf("recvfrom() error\n");
- return -4;
+ seconds_transmit = -4;
+ goto _end;
}
recvfrom(sockfd, (char *) msg, len, 0, NULL, NULL);
ntohl_fp(&msg->xmt, &prt->xmt);
- time_t seconds_transmit;
Ntp2Unix(prt->xmt.Ul_i.Xl_ui, seconds_transmit);
+ _end:
+
delete msg;
delete prt;
ip = CNetAddr(((sockaddr_in *)&cliaddr)->sin_addr);
int64_t nTime = DoReq(sockfd, servlen, cliaddr);
- closesocket(sockfd);
+ CloseSocket(sockfd);
return nTime;
}
-int64_t NtpGetTime(std::string &strHostName)
+int64_t NtpGetTime(const std::string &strHostName)
{
struct sockaddr cliaddr;
int64_t nTime = DoReq(sockfd, servlen, cliaddr);
- closesocket(sockfd);
+ CloseSocket(sockfd);
return nTime;
}
std::string strTrustedUpstream = "localhost";
// Current offset
-int64_t nNtpOffset = INT64_MAX;
+int64_t nNtpOffset = numeric_limits<int64_t>::max();
int64_t GetNtpOffset() {
return nNtpOffset;
}
void ThreadNtpSamples(void* parg) {
- const int64_t nMaxOffset = 86400; // Not a real limit, just sanity threshold.
+ const int64_t nMaxOffset = nOneDay; // Not a real limit, just sanity threshold.
printf("Trying to find NTP server at localhost...\n");
// Trying to get new offset sample from trusted NTP server.
int64_t nClockOffset = NtpGetTime(strTrustedUpstream) - GetTime();
- if (abs64(nClockOffset) < nMaxOffset) {
+ if (abs(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;
+ nNtpOffset = numeric_limits<int64_t>::max();
strTrustedUpstream = "localhost";
int nSleepMinutes = 1 + GetRandInt(9); // Sleep for 1-10 minutes.
CNetAddr ip;
int64_t nClockOffset = NtpGetTime(ip) - GetTime();
- if (abs64(nClockOffset) < nMaxOffset) { // Skip the deliberately wrong timestamps
+ if (abs(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);
}
}
else {
// Not enough offsets yet, try to collect additional samples later.
- nNtpOffset = INT64_MAX;
+ nNtpOffset = numeric_limits<int64_t>::max();
int nSleepMinutes = 1 + GetRandInt(4); // Sleep for 1-5 minutes.
for (int i = 0; i < nSleepMinutes * 60 && !fShutdown; i++)
Sleep(1000);
}
}
- if (GetNodesOffset() == INT_MAX && abs64(nNtpOffset) > 40 * 60)
+ if (GetNodesOffset() == numeric_limits<int64_t>::max() && abs(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.");