lywsvip/Cocos2d-Lua-Community
1
0
Fork 0
mirror of https://github.com/u0u0/Cocos2d-Lua-Community.git synced 2026-05-06 22:01:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

support domain name for host

Browse Source
This commit is contained in:
u0u0
2021-09-23 21:44:37 +08:00
parent 5ed57a5af6
commit 7481b53a60
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cocos/network/AsyncTCP.cpp
View File

@@ -67,7 +67,7 @@ static void printErrno(const char *prefix)
#endif
}
static int checkIPv6(const char *hostname, bool &isIpv6)
static int getHostInfo(const char *hostname, std::string &ipAddr, bool &isIpv6)
{
struct addrinfo *iterator = NULL, *resolved = NULL;
struct addrinfo hints;
@@ -85,7 +85,7 @@ static int checkIPv6(const char *hostname, bool &isIpv6)
isIpv6 = false;
for (iterator = resolved; iterator; iterator = iterator->ai_next) {
char hbuf[NI_MAXHOST];
char hbuf[NI_MAXHOST] = {0};
ret = getnameinfo(iterator->ai_addr, (socklen_t) iterator->ai_addrlen,
hbuf, (socklen_t) sizeof(hbuf), NULL, 0, NI_NUMERICHOST);
if (ret) {
@@ -93,6 +93,7 @@ static int checkIPv6(const char *hostname, bool &isIpv6)
printf("== AsyncTCP getnameinfo error:%d\n", ret);
return ret;
}
ipAddr = hbuf;
if (iterator->ai_family == AF_INET6) {
isIpv6 = true;
break;
@@ -242,13 +243,14 @@ void AsyncTCP::socketThread()
// 1. check dns isIpv6
notify(EVENT_CONNECTING, nullptr, 0);
bool isIpv6;
if (checkIPv6(_host.c_str(), isIpv6)) {
std::string ipAddr;
if (getHostInfo(_host.c_str(), ipAddr, isIpv6)) {
notify(EVENT_FAILED, nullptr, 0);
return; // get error in checkIPv6
}
// 2. open socket
if (openTCP(isIpv6) < 0) {
if (openTCP(ipAddr, isIpv6) < 0) {
closeTCP();
notify(EVENT_FAILED, nullptr, 0);
return; // open error
@@ -329,7 +331,7 @@ int AsyncTCP::sendTCP(unsigned char *buff, size_t size)
return 0;
}
int AsyncTCP::openTCP(bool isIpv6)
int AsyncTCP::openTCP(std::string &ipAddr, bool isIpv6)
{
int ret;
@@ -365,7 +367,7 @@ int AsyncTCP::openTCP(bool isIpv6)
memset(&servaddr6, 0, sizeof(servaddr6));
servaddr6.sin6_family = AF_INET6;
servaddr6.sin6_port = htons(_port);
ret = inet_pton(AF_INET6, _host.c_str(), &servaddr6.sin6_addr);
ret = inet_pton(AF_INET6, ipAddr.c_str(), &servaddr6.sin6_addr);
if (ret <= 0) {
printErrno("inet_pton AF_INET6");
return -1;
@@ -376,7 +378,7 @@ int AsyncTCP::openTCP(bool isIpv6)
memset(&servaddr, 0, sizeof(servaddr));
servaddr.sin_family = AF_INET;
servaddr.sin_port = htons(_port);
ret = inet_pton(AF_INET, _host.c_str(), &servaddr.sin_addr);
ret = inet_pton(AF_INET, ipAddr.c_str(), &servaddr.sin_addr);
if (ret <= 0) {
printErrno("inet_pton AF_INET");
return -1;

2
cocos/network/AsyncTCP.h
View File

@@ -71,7 +71,7 @@ private:
void socketThread();
void notify(int state, unsigned char *msg, size_t size); // call on socketThread
int openTCP(bool isIpv6); // call on socketThread
int openTCP(std::string &ipAddr, bool isIpv6); // call on socketThread
void closeTCP(); // call on socketThread
int recvTCP(); // call on socketThread
int sendTCP(unsigned char *buff, size_t size); // call on socketThread