wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5666 from per-allansson/windows-wolfio-connect-timeout-bug

Browse Source
This commit is contained in:
Hayden Roche
2022-10-11 07:42:46 -07:00
committed by GitHub
parent b7f74962ad 68dc01e7b7
commit 5f0d85adb5
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/wolfio.c
View File

@@ -907,12 +907,12 @@ int wolfIO_Send(SOCKET_T sd, char *buf, int sz, int wrFlags)
#ifndef USE_WINDOWS_API #ifndef USE_WINDOWS_API
nfds = (int)sockfd + 1; nfds = (int)sockfd + 1;
#endif
if ((sockfd < 0) || (sockfd >= FD_SETSIZE)) { if ((sockfd < 0) || (sockfd >= FD_SETSIZE)) {
WOLFSSL_MSG("socket fd out of FDSET range"); WOLFSSL_MSG("socket fd out of FDSET range");
return -1; return -1;
} }
#endif
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_SET(sockfd, &rfds); FD_SET(sockfd, &rfds);
@@ -1156,8 +1156,13 @@ int wolfIO_TcpConnect(SOCKET_T* sockfd, const char* ip, word16 port, int to_sec)
ret = connect(*sockfd, (SOCKADDR *)&addr, sockaddr_len); ret = connect(*sockfd, (SOCKADDR *)&addr, sockaddr_len);
#ifdef HAVE_IO_TIMEOUT #ifdef HAVE_IO_TIMEOUT
if (ret != 0) { if ((ret != 0) && (to_sec > 0)) {
if ((errno == EINPROGRESS) && (to_sec > 0)) { #ifdef USE_WINDOWS_API
if ((ret == SOCKET_ERROR) && (wolfSSL_LastError(ret) == WSAEWOULDBLOCK))
#else
if (errno == EINPROGRESS)
#endif
{
/* wait for connect to complete */ /* wait for connect to complete */
ret = wolfIO_Select(*sockfd, to_sec); ret = wolfIO_Select(*sockfd, to_sec);