mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wolfssl connect

Browse Source
This commit is contained in:
RipleyTom 2023-03-03 20:41:12 +01:00 committed by Megamouse
parent 382a7c94a2
commit 2de4c03faa
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/Emu/NP/rpcn_client.cpp
View File

@ -499,7 +499,7 @@ namespace rpcn
return recvn_result::recvn_nodata; return recvn_result::recvn_nodata;
num_timeouts++; num_timeouts++;
if (num_timeouts >= 1000) if (num_timeouts >= 50)
{ {
rpcn_log.error("recvn timeout with %d bytes received", n_recv); rpcn_log.error("recvn timeout with %d bytes received", n_recv);
return recvn_result::recvn_timeout; return recvn_result::recvn_timeout;
@ -541,7 +541,7 @@ namespace rpcn
if (wolfSSL_want_write(write_wssl)) if (wolfSSL_want_write(write_wssl))
{ {
num_timeouts++; num_timeouts++;
if (num_timeouts >= 1000) if (num_timeouts >= 50)
{ {
rpcn_log.error("send_packet timeout with %d bytes sent", n_sent); rpcn_log.error("send_packet timeout with %d bytes sent", n_sent);
return error_and_disconnect("Failed to send all the bytes"); return error_and_disconnect("Failed to send all the bytes");
@ -707,11 +707,11 @@ namespace rpcn
sockfd = socket(AF_INET, SOCK_STREAM, 0); sockfd = socket(AF_INET, SOCK_STREAM, 0);
#ifdef _WIN32 #ifdef _WIN32
u32 timeout = 5; u32 timeout = 200; // 200ms
#else #else
struct timeval timeout; struct timeval timeout;
timeout.tv_sec = 0; timeout.tv_sec = 0;
timeout.tv_usec = 50000; // 50ms timeout.tv_usec = 200000; // 200ms
#endif #endif
if (setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, reinterpret_cast<char*>(&timeout), sizeof(timeout)) < 0) if (setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, reinterpret_cast<char*>(&timeout), sizeof(timeout)) < 0)
@ -750,7 +750,7 @@ namespace rpcn
int ret_connect; int ret_connect;
while ((ret_connect = wolfSSL_connect(read_wssl)) != SSL_SUCCESS) while ((ret_connect = wolfSSL_connect(read_wssl)) != SSL_SUCCESS)
{ {
if (wolfSSL_want_read(read_wssl)) if (wolfSSL_want_read(read_wssl) || wolfSSL_want_write(read_wssl))
continue; continue;
state = rpcn_state::failure_wolfssl; state = rpcn_state::failure_wolfssl;