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_timeleft: s/conn/data in first argument

Browse Source 
As the function doesn't really use the connectdata struct but only the
SessionHanadle struct I modified what argument it wants.
This commit is contained in:
Daniel Stenberg 2011-01-04 23:07:58 +01:00
parent a2c8966d50
commit adb49ad8bb
17 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/connect.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -124,15 +124,17 @@ singleipconnect(struct connectdata *conn,
* transfer/connection. If the value is negative, the timeout time has already * transfer/connection. If the value is negative, the timeout time has already
* elapsed. * elapsed.
* *
* The start time is stored in progress.t_startsingle - as set with
* Curl_pgrsTime(..., TIMER_STARTSINGLE);
*
* If 'nowp' is non-NULL, it points to the current time. * If 'nowp' is non-NULL, it points to the current time.
* 'duringconnect' is FALSE if not during a connect, as then of course the * 'duringconnect' is FALSE if not during a connect, as then of course the
* connect timeout is not taken into account! * connect timeout is not taken into account!
*/ */
long Curl_timeleft(struct connectdata *conn, long Curl_timeleft(struct SessionHandle *data,
struct timeval *nowp, struct timeval *nowp,
bool duringconnect) bool duringconnect)
{ {
struct SessionHandle *data = conn->data;
int timeout_set = 0; int timeout_set = 0;
long timeout_ms = duringconnect?DEFAULT_CONNECT_TIMEOUT:0; long timeout_ms = duringconnect?DEFAULT_CONNECT_TIMEOUT:0;
struct timeval now; struct timeval now;
@ -673,7 +675,7 @@ CURLcode Curl_is_connected(struct connectdata *conn,
now = Curl_tvnow(); now = Curl_tvnow();
/* figure out how long time we have left to connect */ /* figure out how long time we have left to connect */
allow = Curl_timeleft(conn, &now, TRUE); allow = Curl_timeleft(data, &now, TRUE);
if(allow < 0) { if(allow < 0) {
/* time-out, bail out, go home */ /* time-out, bail out, go home */
@ -1040,7 +1042,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */
*connected = FALSE; /* default to not connected */ *connected = FALSE; /* default to not connected */
/* get the timeout left */ /* get the timeout left */
timeout_ms = Curl_timeleft(conn, &before, TRUE); timeout_ms = Curl_timeleft(data, &before, TRUE);
if(timeout_ms < 0) { if(timeout_ms < 0) {
/* a precaution, no need to continue if time already is up */ /* a precaution, no need to continue if time already is up */

4
lib/connect.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -37,7 +37,7 @@ CURLcode Curl_connecthost(struct connectdata *conn,
/* generic function that returns how much time there's left to run, according /* generic function that returns how much time there's left to run, according
to the timeouts set */ to the timeouts set */
long Curl_timeleft(struct connectdata *conn, long Curl_timeleft(struct SessionHandle *data,
struct timeval *nowp, struct timeval *nowp,
bool duringconnect); bool duringconnect);

4
lib/ftp.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -322,7 +322,7 @@ static CURLcode AllowServerConnect(struct connectdata *conn)
curl_socklen_t size = (curl_socklen_t) sizeof(add); curl_socklen_t size = (curl_socklen_t) sizeof(add);
for(;;) { for(;;) {
timeout_ms = Curl_timeleft(conn, NULL, TRUE); timeout_ms = Curl_timeleft(data, NULL, TRUE);
if(timeout_ms < 0) { if(timeout_ms < 0) {
/* if a timeout was already reached, bail out */ /* if a timeout was already reached, bail out */

4
lib/gtls.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -238,7 +238,7 @@ static CURLcode handshake(struct connectdata *conn,
for(;;) { for(;;) {
/* check allowed time left */ /* check allowed time left */
timeout_ms = Curl_timeleft(conn, NULL, duringconnect); timeout_ms = Curl_timeleft(data, NULL, duringconnect);
if(timeout_ms < 0) { if(timeout_ms < 0) {
/* no need to continue if time already is up */ /* no need to continue if time already is up */

4
lib/hostares.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -224,7 +224,7 @@ CURLcode Curl_wait_for_resolv(struct connectdata *conn,
long timeout; long timeout;
struct timeval now = Curl_tvnow(); struct timeval now = Curl_tvnow();
timeout = Curl_timeleft(conn, &now, TRUE); timeout = Curl_timeleft(data, &now, TRUE);
if(!timeout) if(!timeout)
timeout = CURL_TIMEOUT_RESOLVE * 1000; /* default name resolve timeout */ timeout = CURL_TIMEOUT_RESOLVE * 1000; /* default name resolve timeout */

4
lib/multi.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -984,7 +984,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
/* we need to wait for the connect state as only then is the start time /* we need to wait for the connect state as only then is the start time
stored, but we must not check already completed handles */ stored, but we must not check already completed handles */
timeout_ms = Curl_timeleft(easy->easy_conn, &now, timeout_ms = Curl_timeleft(data, &now,
(easy->state <= CURLM_STATE_WAITDO)? (easy->state <= CURLM_STATE_WAITDO)?
TRUE:FALSE); TRUE:FALSE);

2
lib/nss.c
View File

@ -1361,7 +1361,7 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
SSL_SetURL(connssl->handle, conn->host.name); SSL_SetURL(connssl->handle, conn->host.name);
/* check timeout situation */ /* check timeout situation */
time_left = Curl_timeleft(conn, NULL, TRUE); time_left = Curl_timeleft(data, NULL, TRUE);
if(time_left < 0L) { if(time_left < 0L) {
failf(data, "timed out before SSL handshake"); failf(data, "timed out before SSL handshake");
goto error; goto error;

4
lib/polarssl.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2010, Hoi-Ho Chan, <hoiho.chan@gmail.com> * Copyright (C) 2010, 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com>
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -229,7 +229,7 @@ Curl_polarssl_connect(struct connectdata *conn,
return CURLE_SSL_CONNECT_ERROR; return CURLE_SSL_CONNECT_ERROR;
} else { } else {
/* wait for data from server... */ /* wait for data from server... */
long timeout_ms = Curl_timeleft(conn, NULL, TRUE); long timeout_ms = Curl_timeleft(data, NULL, TRUE);
if(timeout_ms < 0) { if(timeout_ms < 0) {
failf(data, "SSL connection timeout"); failf(data, "SSL connection timeout");

4
lib/qssl.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -175,7 +175,7 @@ static CURLcode Curl_qsossl_handshake(struct connectdata * conn, int sockindex)
h->exitPgm = Curl_qsossl_trap_cert; h->exitPgm = Curl_qsossl_trap_cert;
/* figure out how long time we should wait at maximum */ /* figure out how long time we should wait at maximum */
timeout_ms = Curl_timeleft(conn, NULL, TRUE); timeout_ms = Curl_timeleft(data, NULL, TRUE);
if(timeout_ms < 0) { if(timeout_ms < 0) {
/* time-out, bail out, go home */ /* time-out, bail out, go home */

6
lib/socks.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -137,7 +137,7 @@ CURLcode Curl_SOCKS4(const char *proxy_name,
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
/* get timeout */ /* get timeout */
timeout = Curl_timeleft(conn, NULL, TRUE); timeout = Curl_timeleft(data, NULL, TRUE);
if(timeout < 0) { if(timeout < 0) {
/* time-out, bail out, go home */ /* time-out, bail out, go home */
@ -399,7 +399,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
} }
/* get timeout */ /* get timeout */
timeout = Curl_timeleft(conn, NULL, TRUE); timeout = Curl_timeleft(data, NULL, TRUE);
if(timeout < 0) { if(timeout < 0) {
/* time-out, bail out, go home */ /* time-out, bail out, go home */

4
lib/socks_gssapi.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2009, Markus Moeller, <markus_moeller@compuserve.com> * Copyright (C) 2009, 2011, Markus Moeller, <markus_moeller@compuserve.com>
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -139,7 +139,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
char *serviceptr = data->set.str[STRING_SOCKS5_GSSAPI_SERVICE]; char *serviceptr = data->set.str[STRING_SOCKS5_GSSAPI_SERVICE];
/* get timeout */ /* get timeout */
timeout = Curl_timeleft(conn, NULL, TRUE); timeout = Curl_timeleft(data, NULL, TRUE);
/* GSSAPI request looks like /* GSSAPI request looks like
* +----+------+-----+----------------+ * +----+------+-----+----------------+

4
lib/socks_sspi.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2009, Markus Moeller, <markus_moeller@compuserve.com> * Copyright (C) 2009, 2011, Markus Moeller, <markus_moeller@compuserve.com>
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -186,7 +186,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
char *service = data->set.str[STRING_SOCKS5_GSSAPI_SERVICE]; char *service = data->set.str[STRING_SOCKS5_GSSAPI_SERVICE];
/* get timeout */ /* get timeout */
timeout = Curl_timeleft(conn, NULL, TRUE); timeout = Curl_timeleft(data, NULL, TRUE);
/* GSSAPI request looks like /* GSSAPI request looks like
* +----+------+-----+----------------+ * +----+------+-----+----------------+

2
lib/ssh.c
View File

@ -2457,7 +2457,7 @@ static CURLcode ssh_easy_statemach(struct connectdata *conn,
if(Curl_pgrsUpdate(conn)) if(Curl_pgrsUpdate(conn))
return CURLE_ABORTED_BY_CALLBACK; return CURLE_ABORTED_BY_CALLBACK;
left = Curl_timeleft(conn, NULL, duringconnect); left = Curl_timeleft(data, NULL, duringconnect);
if(left < 0) { if(left < 0) {
failf(data, "Operation timed out\n"); failf(data, "Operation timed out\n");
return CURLE_OPERATION_TIMEDOUT; return CURLE_OPERATION_TIMEDOUT;

4
lib/ssluse.c
View File

@ -2394,7 +2394,7 @@ ossl_connect_common(struct connectdata *conn,
if(ssl_connect_1==connssl->connecting_state) { if(ssl_connect_1==connssl->connecting_state) {
/* Find out how much more time we're allowed */ /* Find out how much more time we're allowed */
timeout_ms = Curl_timeleft(conn, NULL, TRUE); timeout_ms = Curl_timeleft(data, NULL, TRUE);
if(timeout_ms < 0) { if(timeout_ms < 0) {
/* no need to continue if time already is up */ /* no need to continue if time already is up */
@ -2411,7 +2411,7 @@ ossl_connect_common(struct connectdata *conn,
ssl_connect_2_writing == connssl->connecting_state) { ssl_connect_2_writing == connssl->connecting_state) {
/* check allowed time left */ /* check allowed time left */
timeout_ms = Curl_timeleft(conn, NULL, TRUE); timeout_ms = Curl_timeleft(data, NULL, TRUE);
if(timeout_ms < 0) { if(timeout_ms < 0) {
/* no need to continue if time already is up */ /* no need to continue if time already is up */

4
lib/tftp.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -218,7 +218,7 @@ static CURLcode tftp_set_timeouts(tftp_state_data_t *state)
time(&state->start_time); time(&state->start_time);
/* Compute drop-dead time */ /* Compute drop-dead time */
timeout_ms = Curl_timeleft(state->conn, NULL, start); timeout_ms = Curl_timeleft(state->conn->data, NULL, start);
if(timeout_ms < 0) { if(timeout_ms < 0) {
/* time-out, bail out, go home */ /* time-out, bail out, go home */

6
lib/transfer.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -1064,7 +1064,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
return result; return result;
if(k->keepon) { if(k->keepon) {
if(0 > Curl_timeleft(conn, &k->now, FALSE)) { if(0 > Curl_timeleft(data, &k->now, FALSE)) {
if(k->size != -1) { if(k->size != -1) {
failf(data, "Operation timed out after %ld milliseconds with %" failf(data, "Operation timed out after %ld milliseconds with %"
FORMAT_OFF_T " out of %" FORMAT_OFF_T " bytes received", FORMAT_OFF_T " out of %" FORMAT_OFF_T " bytes received",
@ -1347,7 +1347,7 @@ Transfer(struct connectdata *conn)
to work with, skip the timeout */ to work with, skip the timeout */
timeout_ms = 0; timeout_ms = 0;
else { else {
totmp = Curl_timeleft(conn, &k->now, FALSE); totmp = Curl_timeleft(data, &k->now, FALSE);
if(totmp < 0) if(totmp < 0)
return CURLE_OPERATION_TIMEDOUT; return CURLE_OPERATION_TIMEDOUT;
else if(!totmp) else if(!totmp)

4
lib/url.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -4515,7 +4515,7 @@ static CURLcode resolve_server(struct SessionHandle *data,
bool *async) bool *async)
{ {
CURLcode result=CURLE_OK; CURLcode result=CURLE_OK;
long timeout_ms = Curl_timeleft(conn, NULL, TRUE); long timeout_ms = Curl_timeleft(data, NULL, TRUE);
/************************************************************* /*************************************************************
* Resolve the name of the server or proxy * Resolve the name of the server or proxy