generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

David Phillips' FD_SETSIZE fix

Browse Source
This commit is contained in:
Daniel Stenberg
2004-11-19 08:52:33 +00:00
parent dcea109bb5
commit 1a05a90f1c
16 changed files with 467 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/connect.c
View File

@@ -97,6 +97,7 @@
#include "strerror.h"
#include "connect.h"
#include "memory.h"
#include "select.h"
/* The last #include file should be: */
#include "memdebug.h"
@@ -202,9 +203,6 @@ static
int waitconnect(curl_socket_t sockfd, /* socket */
long timeout_msec)
{
fd_set fd;
fd_set errfd;
struct timeval interval;
int rc;
#ifdef mpeix
/* Call this function once now, and ignore the results. We do this to
@@ -214,18 +212,7 @@ int waitconnect(curl_socket_t sockfd, /* socket */
#endif
/* now select() until we get connect or timeout */
FD_ZERO(&fd);
FD_SET(sockfd, &fd);
FD_ZERO(&errfd);
FD_SET(sockfd, &errfd);
interval.tv_sec = (int)(timeout_msec/1000);
timeout_msec -= interval.tv_sec*1000;
interval.tv_usec = timeout_msec*1000;
rc = select(sockfd+1, NULL, &fd, &errfd, &interval);
rc = Curl_select(CURL_SOCKET_BAD, sockfd, timeout_msec);
if(-1 == rc)
/* error, no connect here, try next */
return WAITCONN_SELECT_ERROR;
@@ -234,7 +221,7 @@ int waitconnect(curl_socket_t sockfd, /* socket */
/* timeout, no connect today */
return WAITCONN_TIMEOUT;
if(FD_ISSET(sockfd, &errfd))
if(rc & CSELECT_ERR)
/* error condition caught */
return WAITCONN_FDSET_ERROR;