feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #1631 from ejohnstown/wolfio-select

Browse Source 
wolfIO Select Update
This commit is contained in:
toddouska
2018-06-26 19:27:20 -07:00
committed by GitHub
parent d8086ded6a 9d7bcf8ec7
commit 1b2876679b
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/wolfio.c
View File

@ -676,21 +676,22 @@ int wolfIO_Send(SOCKET_T sd, char *buf, int sz, int wrFlags)
return ret; return ret;
} }
#ifdef _MSC_VER
/* 4204: non-constant aggregate initializer (nfds = sockfd + 1) */
#pragma warning(disable: 4204)
#endif
int wolfIO_Select(SOCKET_T sockfd, int to_sec) int wolfIO_Select(SOCKET_T sockfd, int to_sec)
{ {
fd_set fds; fd_set rfds, wfds;
SOCKET_T nfds = sockfd + 1; int nfds = 0;
struct timeval timeout = { (to_sec > 0) ? to_sec : 0, 0}; struct timeval timeout = { (to_sec > 0) ? to_sec : 0, 0};
int ret; int ret;
FD_ZERO(&fds); #ifndef USE_WINDOWS_API
FD_SET(sockfd, &fds); nfds = (int)sockfd + 1;
#endif
ret = select(nfds, &fds, &fds, NULL, &timeout); FD_ZERO(&rfds);
FD_SET(sockfd, &rfds);
wfds = rfds;
ret = select(nfds, &rfds, &wfds, NULL, &timeout);
if (ret == 0) { if (ret == 0) {
#ifdef DEBUG_HTTP #ifdef DEBUG_HTTP
printf("Timeout: %d\n", ret); printf("Timeout: %d\n", ret);
@ -698,8 +699,11 @@ int wolfIO_Send(SOCKET_T sd, char *buf, int sz, int wrFlags)
return HTTP_TIMEOUT; return HTTP_TIMEOUT;
} }
else if (ret > 0) { else if (ret > 0) {
if (FD_ISSET(sockfd, &fds)) if (FD_ISSET(sockfd, &wfds)) {
return 0; if (!FD_ISSET(sockfd, &rfds)) {
return 0;
}
}
} }
return SOCKET_ERROR_E; return SOCKET_ERROR_E;
} }