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 | |
| 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
| -rw-r--r-- | main/bridge_basic.c | 6 | ||||
| -rw-r--r-- | main/features_config.c | 14 |
2 files changed, 10 insertions, 10 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); diff --git a/main/features_config.c b/main/features_config.c index c3f3191a2..d9a304302 100644 --- a/main/features_config.c +++ b/main/features_config.c @@ -45,8 +45,8 @@ <configOption name="transferdigittimeout" default="3"> <synopsis>Seconds allowed between digit presses when dialing a transfer destination</synopsis> </configOption> - <configOption name="atxfernoanswertimeout" default="15000"> - <synopsis>Milliseconds to wait for attended transfer destination to answer</synopsis> + <configOption name="atxfernoanswertimeout" default="15"> + <synopsis>Seconds to wait for attended transfer destination to answer</synopsis> </configOption> <configOption name="atxferdropcall" default="no"> <synopsis>Hang up the call entirely if the attended transfer fails</synopsis> @@ -62,8 +62,8 @@ hang up all channels involved in the transfer.</para> </description> </configOption> - <configOption name="atxferloopdelay" default="10000"> - <synopsis>Milliseconds to wait between attempts to re-dial transfer destination</synopsis> + <configOption name="atxferloopdelay" default="10"> + <synopsis>Seconds to wait between attempts to re-dial transfer destination</synopsis> <see-also><ref type="configOption">atxferdropcall</ref></see-also> </configOption> <configOption name="atxfercallbackretries" default="2"> @@ -355,10 +355,10 @@ #define DEFAULT_RECORDING_FAIL_SOUND "" /*! Default xfer options */ -#define DEFAULT_TRANSFER_DIGIT_TIMEOUT 3000 -#define DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER 15000 +#define DEFAULT_TRANSFER_DIGIT_TIMEOUT 3 +#define DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER 15 #define DEFAULT_ATXFER_DROP_CALL 0 -#define DEFAULT_ATXFER_LOOP_DELAY 10000 +#define DEFAULT_ATXFER_LOOP_DELAY 10 #define DEFAULT_ATXFER_CALLBACK_RETRIES 2 #define DEFAULT_XFERSOUND "beep" #define DEFAULT_XFERFAILSOUND "beeperr" |