diff --git a/src/kit/taosnetwork/client.c b/src/kit/taosnetwork/client.c index 74c161bf67fb97e64625758643b1ad94f4078d9f..102f9b9d89b3e39218d53105fe620b0726e41d45 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 a2bb2b2b65b5425d0cd78b0902917158a9275150..1c3bc6fa098d793c2c7d1c355c524c755301b57b 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 e5c3806d1b918ea09cb209cd0093e8199768e8cb..ecc69ec3d3d06b35ab05d9f932819c127881a4b2 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 bcacd8575ae8b3680ff1ce0073419c74264e7eaa..8a51c389e9f2efdcf3eaad97d434269ff3c0061f 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 6514c2f851e2a0c35ac78905cff2bfa9bb9d571c..8fd198ba80fc6783161fd05b9fc73cbdbf28cf29 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 21949e93af1d9a99d6b19be04ee11a73ff05ed70..f4aca91cba7fb330b3a74ba2206d568df8563cf3 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;