aboutsummaryrefslogtreecommitdiff
path: root/lib/tftp.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/tftp.c')
-rw-r--r--lib/tftp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/tftp.c b/lib/tftp.c
index b1a34a5df..ed391be13 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -177,7 +177,8 @@ void tftp_set_timeouts(tftp_state_data_t *state)
time(&state->start_time);
if(state->state == TFTP_STATE_START) {
/* Compute drop-dead time */
- maxtime = (time_t)(data->set.connecttimeout?data->set.connecttimeout:30);
+ maxtime = (time_t)(data->set.connecttimeout/1000L?
+ data->set.connecttimeout/1000L:30);
state->max_time = state->start_time+maxtime;
/* Set per-block timeout to total */
@@ -195,7 +196,8 @@ void tftp_set_timeouts(tftp_state_data_t *state)
else {
/* Compute drop-dead time */
- maxtime = (time_t)(data->set.timeout?data->set.timeout/1000L:3600);
+ maxtime = (time_t)(data->set.timeout/1000L?
+ data->set.timeout/1000L:3600);
state->max_time = state->start_time+maxtime;
/* Set per-block timeout to 10% of total */