xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

os: fix Mac test error

This commit is contained in:
afwerar 2022-09-26 11:30:40 +08:00
parent 00a9491a97
commit 91b35a0b62
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/os/osSocket.h
View File

@ -167,7 +167,7 @@ uint32_t ip2uint(const char *const ip_addr);
void taosIgnSIGPIPE(); void taosIgnSIGPIPE();
void taosSetMaskSIGPIPE(); void taosSetMaskSIGPIPE();
uint32_t taosInetAddr(const char *ipAddr); uint32_t taosInetAddr(const char *ipAddr);
const char *taosInetNtoa(struct in_addr ipInt); const char *taosInetNtoa(struct in_addr ipInt, char *dstStr, int32_t len);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
source/libs/sync/src/syncUtil.c
View File

@ -57,7 +57,7 @@ void syncUtilU642Addr(uint64_t u64, char* host, size_t len, uint16_t* port) {
struct in_addr addr; struct in_addr addr;
addr.s_addr = hostU32; addr.s_addr = hostU32;
snprintf(host, len, "%s", taosInetNtoa(addr)); taosInetNtoa(addr, host, len);
*port = (uint16_t)((u64 & 0x00000000FFFF0000) >> 16); *port = (uint16_t)((u64 & 0x00000000FFFF0000) >> 16);
} }

8
source/os/src/osSocket.c
View File

@ -312,10 +312,8 @@ uint32_t taosInetAddr(const char *ipAddr) {
return inet_addr(ipAddr); return inet_addr(ipAddr);
#endif #endif
} }
const char *taosInetNtoa(struct in_addr ipInt) { const char *taosInetNtoa(struct in_addr ipInt, char *dstStr, int32_t len) {
// not thread safe, only for debug usage while print log return inet_ntop(AF_INET, &ipInt, dstStr, len);
char tmpDstStr[16];
return inet_ntop(AF_INET, &ipInt, tmpDstStr, INET6_ADDRSTRLEN);
} }
#ifndef SIGPIPE #ifndef SIGPIPE
@ -666,7 +664,7 @@ int taosGetLocalIp(const char *eth, char *ip) {
return -1; return -1;
} }
memcpy(&sin, &ifr.ifr_addr, sizeof(sin)); memcpy(&sin, &ifr.ifr_addr, sizeof(sin));
snprintf(ip, 64, "%s", taosInetNtoa(sin.sin_addr)); taosInetNtoa(sin.sin_addr, ip, 64);
taosCloseSocketNoCheck1(fd); taosCloseSocketNoCheck1(fd);
#endif #endif
return 0; return 0;