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

Yang Tse pointed out a few remaining quirks from my timeout refactoring from

Browse Source 
Feb 7 that didn't abort properly on timeouts. These are actually old
problems but now they should be fixed.
This commit is contained in:
Daniel Stenberg
2008-02-11 22:03:31 +00:00
parent dc9fe9c361
commit fcc320ee40
4 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/tftp.c
View File

@@ -189,16 +189,24 @@ const struct Curl_handler Curl_handler_tftp = {
*
*
**********************************************************/
static void tftp_set_timeouts(tftp_state_data_t *state)
static CURLcode tftp_set_timeouts(tftp_state_data_t *state)
{
time_t maxtime, timeout;
long timeout_ms;
time(&state->start_time);
/* Compute drop-dead time */
timeout_ms = Curl_timeleft(state->conn, NULL, TRUE);
if(timeout_ms < 0) {
/* time-out, bail out, go home */
failf(state->conn->data, "Connection time-out");
return CURLE_OPERATION_TIMEDOUT;
}
if(state->state == TFTP_STATE_START) {
/* Compute drop-dead time */
timeout_ms = Curl_timeleft(state->conn, NULL, TRUE);
maxtime = (time_t)(timeout_ms + 500) / 1000;
state->max_time = state->start_time+maxtime;
@@ -219,8 +227,6 @@ static void tftp_set_timeouts(tftp_state_data_t *state)
}
else {
/* Compute drop-dead time */
timeout_ms = Curl_timeleft(state->conn, NULL, TRUE);
if(timeout_ms > 0)
maxtime = (time_t)(timeout_ms + 500) / 1000;
else
@@ -250,6 +256,8 @@ static void tftp_set_timeouts(tftp_state_data_t *state)
"set timeouts for state %d; Total %d, retry %d maxtry %d\n",
state->state, (state->max_time-state->start_time),
state->retry_time, state->retry_max);
return CURLE_OK;
}
/**********************************************************
@@ -343,13 +351,17 @@ static CURLcode tftp_send_first(tftp_state_data_t *state, tftp_event_t event)
case TFTP_EVENT_ACK: /* Connected for transmit */
infof(data, "%s\n", "Connected for transmit");
state->state = TFTP_STATE_TX;
tftp_set_timeouts(state);
res = tftp_set_timeouts(state);
if(res)
break;
return tftp_tx(state, event);
case TFTP_EVENT_DATA: /* connected for receive */
infof(data, "%s\n", "Connected for receive");
state->state = TFTP_STATE_RX;
tftp_set_timeouts(state);
res = tftp_set_timeouts(state);
if(res)
break;
return tftp_rx(state, event);
case TFTP_EVENT_ERROR: