-#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"
+using namespace std;
+
extern int GetRandInt(int nMax);
/*
typedef struct {
union {
- uint32_t Xl_ui;
+ uint32_t Xl_ui=0;
int32_t Xl_i;
} Ul_i;
union {
- uint32_t Xl_uf;
+ uint32_t Xl_uf=0;
int32_t Xl_f;
} Ul_f;
} 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
}
struct pkt {
- uint8_t li_vn_mode; /* leap indicator, version and mode */
- uint8_t stratum; /* peer stratum */
- uint8_t ppoll; /* peer poll interval */
- int8_t precision; /* peer clock precision */
- uint32_t rootdelay; /* distance to primary clock */
- uint32_t rootdispersion; /* clock dispersion */
- uint32_t refid; /* reference clock ID */
+ uint8_t li_vn_mode=227; /* leap indicator, version and mode */
+ uint8_t stratum=0; /* peer stratum */
+ uint8_t ppoll=4; /* peer poll interval */
+ int8_t precision=0; /* peer clock precision */
+ uint32_t rootdelay=0; /* distance to primary clock */
+ uint32_t rootdispersion=0; /* clock dispersion */
+ uint32_t refid=0; /* reference clock ID */
l_fp ref; /* time peer clock was last updated */
l_fp org; /* originate time stamp */
l_fp rec; /* receive time stamp */
l_fp xmt; /* transmit time stamp */
- uint32_t exten[1]; /* misused */
- uint8_t mac[5 * sizeof(uint32_t)]; /* mac */
+ uint32_t exten[1] = {0}; /* misused */
+ uint8_t mac[5 * sizeof(uint32_t)] = {0}; /* mac */
};
const int nServersCount = 162;
-std::string NtpServers[162] = {
+string NtpServers[162] = {
// Microsoft
"time.windows.com",
// ... To be continued
};
-bool InitWithHost(std::string &strHostName, SOCKET &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr) {
- sockfd = -1;
+bool InitWithHost(const 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);
+ vector<CNetAddr> vIP;
+ 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;
}
}
time_t seconds_transmit;
int len = 48;
- msg->li_vn_mode=227;
- msg->stratum=0;
- msg->ppoll=4;
- msg->precision=0;
- msg->rootdelay=0;
- msg->rootdispersion=0;
-
- msg->ref.Ul_i.Xl_i=0;
- msg->ref.Ul_f.Xl_f=0;
- msg->org.Ul_i.Xl_i=0;
- msg->org.Ul_f.Xl_f=0;
- msg->rec.Ul_i.Xl_i=0;
- msg->rec.Ul_f.Xl_f=0;
- msg->xmt.Ul_i.Xl_i=0;
- msg->xmt.Ul_f.Xl_f=0;
-
int retcode = sendto(sockfd, (char *) msg, len, 0, &cliaddr, servlen);
if (retcode < 0) {
printf("sendto() failed: %d\n", retcode);
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 string &strHostName)
{
struct sockaddr cliaddr;
int64_t nTime = DoReq(sockfd, servlen, cliaddr);
- closesocket(sockfd);
+ CloseSocket(sockfd);
return nTime;
}
// NTP server, which we unconditionally trust. This may be your own installation of ntpd somewhere, for example.
// "localhost" means "trust no one"
-std::string strTrustedUpstream = "localhost";
+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");
- std::string strLocalHost = "127.0.0.1";
+ 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");
// 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.");
+ 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);
+ uiInterface.ThreadSafeMessageBox(strMessage+" ", string("NovaCoin"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION);
}
printf("nNtpOffset = %+" PRId64 " (%+" PRId64 " minutes)\n", nNtpOffset, nNtpOffset/60);
git://git.novaco.in / novacoin.git / blobdiff