romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 04:13:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

TFTP: send legal timeout value

Browse source 
Eric Mertens posted bug #3003705: when we made TFTP use the
correct timeout option when sent to the server (fixed May 18th
2010) it became obvious that libcurl used invalid timeout values
(300 by default while the RFC allows nothing above 255). While of
course it is obvious that as TFTP has worked thus far without
being able to set timeout at all, just removing the setting
wouldn't make any difference in behavior. I decided to still keep
it (but fix the problem) as it now actually allows for easier
(future) customization of the timeout.

(http://curl.haxx.se/bug/view.cgi?id=3003705)
This commit is contained in:
Daniel Stenberg 2010-05-21 23:29:52 +02:00
parent 0bb6deda72
commit d17709da31
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/tftp.c
View file

@ -526,8 +526,9 @@ static CURLcode tftp_send_first(tftp_state_data_t *state, tftp_event_t event)
TFTP_OPTION_BLKSIZE);
sbytes += tftp_option_add(state, sbytes,
(char *)state->spacket.data+sbytes, buf );
/* add timeout option, this is the max time the session may live */
snprintf( buf, sizeof(buf), "%d", state->retry_time*state->retry_max );
/* add timeout option */
snprintf( buf, sizeof(buf), "%d", state->retry_time);
sbytes += tftp_option_add(state, sbytes,
(char *)state->spacket.data+sbytes,
TFTP_OPTION_INTERVAL);