diff options
author | Mark Michelson <mmichelson@digium.com> | 2013-09-17 17:10:51 +0000 |
---|---|---|
committer | Mark Michelson <mmichelson@digium.com> | 2013-09-17 17:10:51 +0000 |
commit | 375c2f5a5c688bdd9e38626fc2f3cd9906339db9 (patch) | |
tree | 1156d7f05cf80cd239eefbd6cfdb9a0e76905d71 /main/bridge_basic.c | |
parent | f653bfa1f3eb250851cfe82780c3af29fc2630e2 (diff) |
Fix other timeouts (atxferloopdelay and atxfernoanswertimeout) to use seconds instead of milliseconds.
Thanks to Richard Mudgett for pointing this out.
........
Merged revisions 399247 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@399248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/bridge_basic.c')
-rw-r--r-- | main/bridge_basic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/bridge_basic.c b/main/bridge_basic.c index 7cac8d733..942a3ce25 100644 --- a/main/bridge_basic.c +++ b/main/bridge_basic.c @@ -2721,7 +2721,7 @@ static enum attended_transfer_stimulus wait_for_stimulus(struct attended_transfe if (!(state_properties[props->state].flags & TRANSFER_STATE_FLAG_TIMED)) { ast_cond_wait(&props->cond, lock); } else { - struct timeval relative_timeout; + struct timeval relative_timeout = { 0, }; struct timeval absolute_timeout; struct timespec timeout_arg; @@ -2730,10 +2730,10 @@ static enum attended_transfer_stimulus wait_for_stimulus(struct attended_transfe } if (state_properties[props->state].flags & TRANSFER_STATE_FLAG_TIMER_LOOP_DELAY) { - relative_timeout = ast_samp2tv(props->atxferloopdelay, 1000); + relative_timeout.tv_sec = props->atxferloopdelay; } else { /* Implied TRANSFER_STATE_FLAG_TIMER_ATXFER_NO_ANSWER */ - relative_timeout = ast_samp2tv(props->atxfernoanswertimeout, 1000); + relative_timeout.tv_sec = props->atxfernoanswertimeout; } absolute_timeout = ast_tvadd(props->start, relative_timeout); |