lywsvip/Cocos2d-Lua-Community
1
0
Fork 0
mirror of https://github.com/u0u0/Cocos2d-Lua-Community.git synced 2026-06-09 07:54:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix win32 connect error, add log for error info.

Browse Source
This commit is contained in:
u0u0
2020-02-29 22:24:39 +08:00
parent fe927d628f
commit 4c119d3aa4
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cocos/network/WebSocket.cpp
View File

@@ -82,6 +82,7 @@ static void _winLog(const char *format, va_list args)
} while (true);
printf("%s", buf);
strcat(buf, "\n");
int pos = 0;
@@ -224,14 +225,15 @@ static lws_context_creation_info convertToContextCreationInfo(const struct lws_p
info.gid = -1;
info.uid = -1;
if (peerServerCert)
{
if (peerServerCert) {
info.options = LWS_SERVER_OPTION_EXPLICIT_VHOSTS | LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT;
}
else
{
} else {
info.options = LWS_SERVER_OPTION_EXPLICIT_VHOSTS | LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT | LWS_SERVER_OPTION_PEER_CERT_NOT_REQUIRED;
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
// open IPv6 on Ipv4 will curse "socket connect fail" on Win32, temporary disable IPv6.
info.options |= LWS_SERVER_OPTION_DISABLE_IPV6;
#endif
info.user = nullptr;
return info;
@@ -1301,6 +1303,7 @@ int WebSocket::onSocketCallback(struct lws *wsi,
break;
case LWS_CALLBACK_CLIENT_CONNECTION_ERROR:
LOGD("WebSocket (%p) onConnectionError: %s\n", this, (char *)in);
ret = onConnectionError();
break;