moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

Curl_is_connected: use correct errno

Browse Source 
The correctly extracted errno contents were mistakenly overwritten by a newer
value that wasn't the correct error value.

Bug: http://curl.haxx.se/mail/lib-2010-08/0242.html
This commit is contained in:
Dirk Manske 2010-08-21 00:29:35 +02:00 committed by Daniel Stenberg
parent eeb2cb05a1
commit ab6681c2c8
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/connect.c
View File

@ -627,6 +627,7 @@ CURLcode Curl_is_connected(struct connectdata *conn,
CURLcode code = CURLE_OK; CURLcode code = CURLE_OK;
curl_socket_t sockfd = conn->sock[sockindex]; curl_socket_t sockfd = conn->sock[sockindex];
long allow = DEFAULT_CONNECT_TIMEOUT; long allow = DEFAULT_CONNECT_TIMEOUT;
int error = 0;
DEBUGASSERT(sockindex >= FIRSTSOCKET && sockindex <= SECONDARYSOCKET); DEBUGASSERT(sockindex >= FIRSTSOCKET && sockindex <= SECONDARYSOCKET);
@ -658,9 +659,11 @@ CURLcode Curl_is_connected(struct connectdata *conn,
/* check for connect without timeout as we want to return immediately */ /* check for connect without timeout as we want to return immediately */
rc = waitconnect(conn, sockfd, 0); rc = waitconnect(conn, sockfd, 0);
if(WAITCONN_TIMEOUT == rc)
/* not an error, but also no connection yet */
return code;
if(WAITCONN_CONNECTED == rc) { if(WAITCONN_CONNECTED == rc) {
int error;
if(verifyconnect(sockfd, &error)) { if(verifyconnect(sockfd, &error)) {
/* we are connected, awesome! */ /* we are connected, awesome! */
conn->bits.tcpconnect = TRUE; conn->bits.tcpconnect = TRUE;
@ -672,38 +675,34 @@ CURLcode Curl_is_connected(struct connectdata *conn,
return CURLE_OK; return CURLE_OK;
} }
/* nope, not connected for real */ /* nope, not connected for real */
data->state.os_errno = error;
infof(data, "Connection failed\n");
code = trynextip(conn, sockindex, connected);
if(code)
failf(data, "Failed connect to %s:%ld; %s",
conn->host.name, conn->port, Curl_strerror(conn, error));
} }
else if(WAITCONN_TIMEOUT != rc) { else {
int error = 0;
/* nope, not connected */ /* nope, not connected */
if(WAITCONN_FDSET_ERROR == rc) { if(WAITCONN_FDSET_ERROR == rc) {
(void)verifyconnect(sockfd, &error); (void)verifyconnect(sockfd, &error);
data->state.os_errno = error; infof(data, "%s\n",Curl_strerror(conn, error));
infof(data, "%s\n",Curl_strerror(conn,error));
} }
else else
infof(data, "Connection failed\n"); infof(data, "Connection failed\n");
code = trynextip(conn, sockindex, connected);
if(code) {
error = SOCKERRNO;
data->state.os_errno = error;
failf(data, "Failed connect to %s:%ld; %s",
conn->host.name, conn->port, Curl_strerror(conn, error));
}
} }
/* /*
* If the connection failed here, we should attempt to connect to the "next * The connection failed here, we should attempt to connect to the "next
* address" for the given host. * address" for the given host. But first remember the latest error.
*/ */
if(error) {
data->state.os_errno = error;
SET_SOCKERRNO(error);
}
code = trynextip(conn, sockindex, connected);
if(code) {
error = SOCKERRNO;
data->state.os_errno = error;
failf(data, "Failed connect to %s:%ld; %s",
conn->host.name, conn->port, Curl_strerror(conn, error));
}
return code; return code;
} }