X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fntp.cpp;h=586aa34075e76a92cfe76b6a2c0d913369473475;hb=588e63208c3a95f5fd4389e230b9a07442742071;hp=b60e80d65b7c730d7f094035d5f8d16a37bbc516;hpb=5a73a5bcab66ec1012ac88b4d61bdc1e0213286c;p=novacoin.git

diff --git a/src/ntp.cpp b/src/ntp.cpp
index b60e80d..586aa34 100644
--- a/src/ntp.cpp
+++ b/src/ntp.cpp
@@ -169,11 +169,7 @@ std::string NtpServers[65] = {
     // ... To be continued
 };
 
-#ifdef WIN32
-bool InitWithRandom(int &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 +203,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 +219,7 @@ bool InitWithRandom(int &sockfd, socklen_t &servlen, struct sockaddr *pcliaddr)
     return false;
 }
 
-#ifdef WIN32
-bool InitWithHost(std::string &strHostName, int &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 +246,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 +261,7 @@ bool InitWithHost(std::string &strHostName, int &sockfd, socklen_t &servlen, str
 }
 
 
-#ifdef WIN32
-int64_t DoReq(int 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;
@@ -296,7 +284,7 @@ int64_t DoReq(int sockfd, socklen_t servlen, struct sockaddr cliaddr)
 
     int len=48;
     sendto(sockfd, (char *) msg, len, 0, &cliaddr, servlen);
-    int n = recvfrom(sockfd, msg, len, 0, NULL, NULL);
+    int n = recvfrom(sockfd, (char *) msg, len, 0, NULL, NULL);
 
     ntohl_fp(&msg->rec, &prt->rec);
     ntohl_fp(&msg->xmt, &prt->xmt);
@@ -315,50 +303,34 @@ int64_t DoReq(int sockfd, socklen_t servlen, struct sockaddr cliaddr)
 
 int64_t NtpGetTime()
 {
-    int sockfd;
     struct sockaddr cliaddr;
 
-#ifdef WIN32
-    int servlen;
-#else
+    SOCKET 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;
 }
 
 int64_t NtpGetTime(std::string &strHostName)
 {
-    int sockfd;
     struct sockaddr cliaddr;
 
-#ifdef WIN32
-    int servlen;
-#else
+    SOCKET 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;
 }