diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-20 22:26:23 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-20 22:26:23 +0000 |
| commit | 9e4e6b976680b9cc38776688680c27a511f96c93 (patch) | |
| tree | cb65e92c45fac79338cbaa100637ad55e1625225 /main/features.c | |
| parent | 13f9f228f5891ee86bf7c75cb9305834d4482b5e (diff) | |
Merged revisions 278167 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r278167 | tilghman | 2010-07-20 15:59:06 -0500 (Tue, 20 Jul 2010) | 4 lines
Do not queue up DTMF frames while a call is on hold.
(Fixes ABE-2110)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@278272 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/main/features.c b/main/features.c index 5b4bc80d6..46eee14d3 100644 --- a/main/features.c +++ b/main/features.c @@ -1321,6 +1321,7 @@ static int play_message_in_bridged_call(struct ast_channel *caller_chan, struct /* First play for caller, put other channel on auto service */ if (ast_autoservice_start(callee_chan)) return -1; + ast_autoservice_ignore(callee_chan, AST_FRAME_DTMF_END); if (ast_stream_and_wait(caller_chan, audiofile, "")) { ast_log(LOG_WARNING, "Failed to play automon message!\n"); ast_autoservice_stop(callee_chan); @@ -1331,6 +1332,7 @@ static int play_message_in_bridged_call(struct ast_channel *caller_chan, struct /* Then play for callee, put other channel on auto service */ if (ast_autoservice_start(caller_chan)) return -1; + ast_autoservice_ignore(caller_chan, AST_FRAME_DTMF_END); if (ast_stream_and_wait(callee_chan, audiofile, "")) { ast_log(LOG_WARNING, "Failed to play automon message !\n"); ast_autoservice_stop(caller_chan); @@ -1475,6 +1477,7 @@ static int builtin_automixmonitor(struct ast_channel *chan, struct ast_channel * if (!ast_strlen_zero(courtesytone)) { if (ast_autoservice_start(callee_chan)) return -1; + ast_autoservice_ignore(callee_chan, AST_FRAME_DTMF_END); if (ast_stream_and_wait(caller_chan, courtesytone, "")) { ast_log(LOG_WARNING, "Failed to play courtesy tone!\n"); ast_autoservice_stop(callee_chan); @@ -1624,6 +1627,7 @@ static int builtin_blindtransfer(struct ast_channel *chan, struct ast_channel *p transferer_real_context = real_ctx(transferer, transferee); /* Start autoservice on chan while we talk to the originator */ ast_autoservice_start(transferee); + ast_autoservice_ignore(transferee, AST_FRAME_DTMF_END); ast_indicate(transferee, AST_CONTROL_HOLD); memset(xferto, 0, sizeof(xferto)); @@ -1771,6 +1775,7 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st transferer_real_context = real_ctx(transferer, transferee); /* Start autoservice on chan while we talk to the originator */ ast_autoservice_start(transferee); + ast_autoservice_ignore(transferee, AST_FRAME_DTMF_END); ast_indicate(transferee, AST_CONTROL_HOLD); /* Transfer */ @@ -2048,6 +2053,7 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st while (!newchan && !atxferdropcall && tries < atxfercallbackretries) { /* Trying to transfer again */ ast_autoservice_start(transferee); + ast_autoservice_ignore(transferee, AST_FRAME_DTMF_END); ast_indicate(transferee, AST_CONTROL_HOLD); newchan = feature_request_and_dial(transferer, transferee, "Local", @@ -2404,6 +2410,7 @@ static int feature_exec_app(struct ast_channel *chan, struct ast_channel *peer, } ast_autoservice_start(idle); + ast_autoservice_ignore(idle, AST_FRAME_DTMF_END); if(work && idle) { pbx_builtin_setvar_helper(work, "DYNAMIC_PEERNAME", idle->name); |