kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-16 17:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix other timeouts (atxferloopdelay and atxfernoanswertimeout) to use seconds instead of milliseconds.

Browse Source 
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
This commit is contained in:
Mark Michelson
2013-09-17 17:10:51 +00:00
parent f653bfa1f3
commit 375c2f5a5c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/bridge_basic.c
View File

@@ -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)) { if (!(state_properties[props->state].flags & TRANSFER_STATE_FLAG_TIMED)) {
ast_cond_wait(&props->cond, lock); ast_cond_wait(&props->cond, lock);
} else { } else {
struct timeval relative_timeout; struct timeval relative_timeout = { 0, };
struct timeval absolute_timeout; struct timeval absolute_timeout;
struct timespec timeout_arg; 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) { 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 { } else {
/* Implied TRANSFER_STATE_FLAG_TIMER_ATXFER_NO_ANSWER */ /* 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); absolute_timeout = ast_tvadd(props->start, relative_timeout);

14
main/features_config.c
View File

@@ -45,8 +45,8 @@
<configOption name="transferdigittimeout" default="3"> <configOption name="transferdigittimeout" default="3">
<synopsis>Seconds allowed between digit presses when dialing a transfer destination</synopsis> <synopsis>Seconds allowed between digit presses when dialing a transfer destination</synopsis>
</configOption> </configOption>
<configOption name="atxfernoanswertimeout" default="15000"> <configOption name="atxfernoanswertimeout" default="15">
<synopsis>Milliseconds to wait for attended transfer destination to answer</synopsis> <synopsis>Seconds to wait for attended transfer destination to answer</synopsis>
</configOption> </configOption>
<configOption name="atxferdropcall" default="no"> <configOption name="atxferdropcall" default="no">
<synopsis>Hang up the call entirely if the attended transfer fails</synopsis> <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> hang up all channels involved in the transfer.</para>
</description> </description>
</configOption> </configOption>
<configOption name="atxferloopdelay" default="10000"> <configOption name="atxferloopdelay" default="10">
<synopsis>Milliseconds to wait between attempts to re-dial transfer destination</synopsis> <synopsis>Seconds to wait between attempts to re-dial transfer destination</synopsis>
<see-also><ref type="configOption">atxferdropcall</ref></see-also> <see-also><ref type="configOption">atxferdropcall</ref></see-also>
</configOption> </configOption>
<configOption name="atxfercallbackretries" default="2"> <configOption name="atxfercallbackretries" default="2">
@@ -355,10 +355,10 @@
#define DEFAULT_RECORDING_FAIL_SOUND "" #define DEFAULT_RECORDING_FAIL_SOUND ""
/*! Default xfer options */ /*! Default xfer options */
#define DEFAULT_TRANSFER_DIGIT_TIMEOUT 3000 #define DEFAULT_TRANSFER_DIGIT_TIMEOUT 3
#define DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER 15000 #define DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER 15
#define DEFAULT_ATXFER_DROP_CALL 0 #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_ATXFER_CALLBACK_RETRIES 2
#define DEFAULT_XFERSOUND "beep" #define DEFAULT_XFERSOUND "beep"
#define DEFAULT_XFERFAILSOUND "beeperr" #define DEFAULT_XFERFAILSOUND "beeperr"