diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-11 22:55:16 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-11 22:55:16 +0000 |
| commit | a0800b9bc2c9f6ec37b65e745d02efd64b1f1f53 (patch) | |
| tree | 83807892ffb00b1616ec723bec6f7707fef4b493 /apps | |
| parent | 8be4ac7decae05827e6b700fe2208db177525740 (diff) | |
Merged revisions 174945 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r174945 | mmichelson | 2009-02-11 16:41:01 -0600 (Wed, 11 Feb 2009) | 29 lines
Fix 'd' option for app_dial and add new option to Answer application
The 'd' option would not work for channel types which use RTP to transport
DTMF digits. The only way to allow for this to work was to answer the channel
if we saw that this option was enabled.
I realized that this may cause issues with CDRs, specifically with giving false
dispositions and answer times. I therefore modified ast_answer to take another
parameter which would tell if the CDR should be marked answered.
I also extended this to the Answer application so that the channel may be answered
but not CDRified if desired.
I also modified app_dictate and app_waitforsilence to only answer the channel if it
is not already up, to help not allow for faulty CDR answer times.
All of these changes are going into Asterisk trunk. For 1.6.0 and 1.6.1, however, all
the changes except for the change to the Answer application will go in since we do
not introduce new features into stable branches
(closes issue #14164)
Reported by: DennisD
Patches:
14164.patch uploaded by putnopvut (license 60)
Tested by: putnopvut
Review: http://reviewboard.digium.com/r/145
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@174947 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_dial.c | 4 | ||||
| -rw-r--r-- | apps/app_dictate.c | 4 | ||||
| -rw-r--r-- | apps/app_waitforsilence.c | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 1759fefe9..f360680cf 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1380,6 +1380,10 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags res = -1; /* reset default */ } + if (ast_test_flag64(&opts, OPT_DTMF_EXIT)) { + __ast_answer(chan, 0, 0); + } + if (continue_exec) *continue_exec = 0; diff --git a/apps/app_dictate.c b/apps/app_dictate.c index 86ccad875..abac0c8ed 100644 --- a/apps/app_dictate.c +++ b/apps/app_dictate.c @@ -116,7 +116,9 @@ static int dictate_exec(struct ast_channel *chan, void *data) return -1; } - ast_answer(chan); + if (chan->_state != AST_STATE_UP) { + ast_answer(chan); + } ast_safe_sleep(chan, 200); for (res = 0; !res;) { if (ast_strlen_zero(filename)) { diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c index eedbf15ac..bb6e06f7b 100644 --- a/apps/app_waitforsilence.c +++ b/apps/app_waitforsilence.c @@ -168,7 +168,9 @@ static int waitfor_exec(struct ast_channel *chan, void *data, int wait_for_silen int iterations = 1, i; time_t waitstart; - res = ast_answer(chan); /* Answer the channel */ + if (chan->_state != AST_STATE_UP) { + res = ast_answer(chan); /* Answer the channel */ + } if (!data || ( (sscanf(data, "%d,%d,%d", &timereqd, &iterations, &timeout) != 3) && (sscanf(data, "%d,%d", &timereqd, &iterations) != 2) && |