From 7f885cb3b3f137ef0b3a13eeb91f448793d59bdc Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 14 Aug 2020 09:39:56 +0000
Subject: [PATCH] TD-1057

---
 src/kit/taosnetwork/client.c      | 4 ++--
 src/kit/taosnetwork/server.c      | 6 +++---
 src/os/inc/osSocket.h             | 2 +-
 src/os/src/detail/osSocket.c      | 2 +-
 src/os/src/windows/w64Socket.c    | 2 +-
 src/plugins/http/src/httpServer.c | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/kit/taosnetwork/client.c b/src/kit/taosnetwork/client.c
index 74c161bf67..102f9b9d89 100644
--- a/src/kit/taosnetwork/client.c
+++ b/src/kit/taosnetwork/client.c
@@ -91,7 +91,7 @@ int checkTcpPort(info_s *info) {
   serverAddr.sin_family = AF_INET;
   serverAddr.sin_port = htons(port);
 
-  serverAddr.sin_addr.s_addr = taosInetAddr(host);
+  serverAddr.sin_addr.s_addr = inet_addr(host);
 
   //printf("=================================\n");
   if (connect(clientSocket, (struct sockaddr *)&serverAddr, sizeof(serverAddr)) < 0) {
@@ -157,7 +157,7 @@ int checkUdpPort(info_s *info) {
   
   serverAddr.sin_family = AF_INET;
   serverAddr.sin_port = htons(port);
-  serverAddr.sin_addr.s_addr = taosInetAddr(host);
+  serverAddr.sin_addr.s_addr = inet_addr(host);
   
   memset(sendbuf, 0, BUFFER_SIZE);
   memset(recvbuf, 0, BUFFER_SIZE);
diff --git a/src/kit/taosnetwork/server.c b/src/kit/taosnetwork/server.c
index a2bb2b2b65..1c3bc6fa09 100644
--- a/src/kit/taosnetwork/server.c
+++ b/src/kit/taosnetwork/server.c
@@ -128,7 +128,7 @@ static void *bindTcpPort(void *sarg) {
         if (errno == EINTR) {
           continue;
         } else {
-          printf("recv Client: %s pkg from TCP port: %d fail:%s.\n", taosInetNtoa(clientAddr.sin_addr), port, strerror(errno));
+          printf("recv Client: %s pkg from TCP port: %d fail:%s.\n", inet_ntoa(clientAddr.sin_addr), port, strerror(errno));
           close(serverSocket);
           return NULL;
         }
@@ -139,7 +139,7 @@ static void *bindTcpPort(void *sarg) {
       }      
     }
     
-    printf("recv Client: %s pkg from TCP port: %d, pkg len: %d\n", taosInetNtoa(clientAddr.sin_addr), port, iDataNum);
+    printf("recv Client: %s pkg from TCP port: %d, pkg len: %d\n", inet_ntoa(clientAddr.sin_addr), port, iDataNum);
     if (iDataNum > 0) {
       send(client, buffer, iDataNum, 0);
       break;
@@ -188,7 +188,7 @@ static void *bindUdpPort(void *sarg) {
       continue;
     }
     if (iDataNum > 0) {
-      printf("recv Client: %s pkg from UDP port: %d, pkg len: %d\n", taosInetNtoa(clientAddr.sin_addr), port, iDataNum);
+      printf("recv Client: %s pkg from UDP port: %d, pkg len: %d\n", inet_ntoa(clientAddr.sin_addr), port, iDataNum);
       //printf("Read msg from udp:%s ... %s\n", buffer, buffer+iDataNum-16);
 
       sendto(serverSocket, buffer, iDataNum, 0, (struct sockaddr *)&clientAddr, (int)sin_size);
diff --git a/src/os/inc/osSocket.h b/src/os/inc/osSocket.h
index e5c3806d1b..ecc69ec3d3 100644
--- a/src/os/inc/osSocket.h
+++ b/src/os/inc/osSocket.h
@@ -67,7 +67,7 @@ int taosSetSockOpt(SOCKET socketfd, int level, int optname, void *optval, int op
 
 // TAOS_OS_FUNC_SOCKET_INET
 uint32_t taosInetAddr(char *ipAddr);
-const char *taosInetNtoa(IN_ADDR ipInt);
+const char *taosInetNtoa(struct in_addr ipInt);
 
 #ifdef __cplusplus
 }
diff --git a/src/os/src/detail/osSocket.c b/src/os/src/detail/osSocket.c
index bcacd8575a..8a51c389e9 100644
--- a/src/os/src/detail/osSocket.c
+++ b/src/os/src/detail/osSocket.c
@@ -65,7 +65,7 @@ uint32_t taosInetAddr(char *ipAddr) {
   return inet_addr(ipAddr);
 }
 
-const char *taosInetNtoa(IN_ADDR ipInt) {
+const char *taosInetNtoa(struct in_addr ipInt) {
   return inet_ntoa(ipInt);
 }
 
diff --git a/src/os/src/windows/w64Socket.c b/src/os/src/windows/w64Socket.c
index 6514c2f851..8fd198ba80 100644
--- a/src/os/src/windows/w64Socket.c
+++ b/src/os/src/windows/w64Socket.c
@@ -76,7 +76,7 @@ uint32_t taosInetAddr(char *ipAddr) {
   }
 }
 
-const char *taosInetNtoa(IN_ADDR ipInt) {
+const char *taosInetNtoa(struct in_addr ipInt) {
   // not thread safe, only for debug usage while print log
   static char tmpDstStr[16];
   return inet_ntop(AF_INET, &ipInt, tmpDstStr, INET6_ADDRSTRLEN);
diff --git a/src/plugins/http/src/httpServer.c b/src/plugins/http/src/httpServer.c
index 21949e93af..f4aca91cba 100644
--- a/src/plugins/http/src/httpServer.c
+++ b/src/plugins/http/src/httpServer.c
@@ -323,7 +323,7 @@ static void *httpAcceptHttpConnection(void *arg) {
     }
 
     pContext->pThread = pThread;
-    sprintf(pContext->ipstr, "%s:%u", taosInetAddr(clientAddr.sin_addr), htons(clientAddr.sin_port));
+    sprintf(pContext->ipstr, "%s:%u", taosInetNtoa(clientAddr.sin_addr), htons(clientAddr.sin_port));
     
     struct epoll_event event;
     event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP | EPOLLERR | EPOLLHUP | EPOLLRDHUP;
-- 
GitLab