Update novacoin.solution concerning to tiny ntp client update #5a73a5b

[novacoin.git] / src / ntp.cpp

diff --git a/src/ntp.cpp b/src/ntp.cpp
index 6ca84a2..dfdd009 100644 (file)
--- a/src/ntp.cpp
+++ b/src/ntp.cpp
@@ -1,9 +1,9 @@
-#include <sys/time.h>
 
 #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>
@@ -57,12 +57,6 @@ inline void Ntp2Unix(uint32_t &n, time_t &u)
     u = n - 0x83aa7e80; // 2208988800 1970 - 1900 in seconds
 }
 
-inline void HTONL_FP(l_fp *h, l_fp *n)
-{
-    (n)->Ul_i.Xl_ui = htonl((h)->Ul_i.Xl_ui);
-    (n)->Ul_f.Xl_uf = htonl((h)->Ul_f.Xl_uf);
-}
-
 inline void ntohl_fp(l_fp *n, l_fp *h)
 {
     (h)->Ul_i.Xl_ui = ntohl((n)->Ul_i.Xl_ui);
@@ -169,11 +163,7 @@ std::string NtpServers[65] = {
     // ... To be continued
 };
 
-#ifdef WIN32
-bool InitWithRandom(SOCKET &sockfd, int &servlen, struct sockaddr *pcliaddr)
-#else
-bool InitWithRandom(int &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr)
-#endif
+bool InitWithRandom(SOCKET &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr)
 {
     int nAttempt = 0;
 
@@ -207,7 +197,7 @@ bool InitWithRandom(int &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr)
 
         sockfd = socket(AF_INET, SOCK_DGRAM, 0);
 
-        if (sockfd == -1)
+        if (sockfd == INVALID_SOCKET)
             continue; // socket initialization error
 
         if (connect(sockfd, (struct sockaddr *) &servaddr, sizeof(servaddr)) == -1 )
@@ -223,11 +213,7 @@ bool InitWithRandom(int &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr)
     return false;
 }
 
-#ifdef WIN32
-bool InitWithHost(std::string &strHostName, SOCKET &sockfd, int &servlen, struct sockaddr *pcliaddr)
-#else
-bool InitWithHost(std::string &strHostName, int &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr)
-#endif
+bool InitWithHost(std::string &strHostName, SOCKET &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr)
 {
     sockfd = -1;
 
@@ -254,7 +240,7 @@ bool InitWithHost(std::string &strHostName, int &sockfd, socklen_t &servlen, str
 
     sockfd = socket(AF_INET, SOCK_DGRAM, 0);
 
-    if (sockfd == -1)
+    if (sockfd == INVALID_SOCKET)
         return false; // socket initialization error
 
     if (connect(sockfd, (struct sockaddr *) &servaddr, sizeof(servaddr)) == -1 )
@@ -269,11 +255,7 @@ bool InitWithHost(std::string &strHostName, int &sockfd, socklen_t &servlen, str
 }
 
 
-#ifdef WIN32
-int64_t DoReq(SOCKET sockfd, int servlen, struct sockaddr cliaddr)
-#else
-int64_t DoReq(int sockfd, socklen_t servlen, struct sockaddr cliaddr)
-#endif
+int64_t DoReq(SOCKET sockfd, socklen_t servlen, struct sockaddr cliaddr)
 {
     struct pkt *msg = new pkt;
     struct pkt *prt  = new pkt;
@@ -317,24 +299,15 @@ int64_t NtpGetTime()
 {
     struct sockaddr cliaddr;
 
-#ifdef WIN32
     SOCKET sockfd;
-    int servlen;
-#else
-    int sockfd;
     socklen_t servlen;
-#endif
 
     if (!InitWithRandom(sockfd, servlen, &cliaddr))
         return -1;
 
     int64_t nTime = DoReq(sockfd, servlen, cliaddr);
 
-#ifdef WIN32
     closesocket(sockfd);
-#else
-    close(sockfd);
-#endif
 
     return nTime;
 }
@@ -343,24 +316,15 @@ int64_t NtpGetTime(std::string &strHostName)
 {
     struct sockaddr cliaddr;
 
-#ifdef WIN32
     SOCKET sockfd;
-    int servlen;
-#else
-    int sockfd;
     socklen_t servlen;
-#endif
 
     if (!InitWithHost(strHostName, sockfd, servlen, &cliaddr))
         return -1;
 
     int64_t nTime = DoReq(sockfd, servlen, cliaddr);
 
-#ifdef WIN32
     closesocket(sockfd);
-#else
-    close(sockfd);
-#endif
 
     return nTime;
 }