diff options
author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-12 19:08:03 +0000 |
---|---|---|
committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-12 19:08:03 +0000 |
commit | 7c8a7ab124ab41dd6199e013232b9dd64ff3a274 (patch) | |
tree | 1f32d002c8a68dfc1967ff87787397876467be79 | |
parent | 249eaba298b855dbdd1be09ce4782a332a7f98fb (diff) |
Merge changes from issue 17592.
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.4.34-rc2@275765 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | ChangeLog | 19 | ||||
-rw-r--r-- | apps/app_dial.c | 5 |
2 files changed, 19 insertions, 5 deletions
@@ -11,11 +11,20 @@ 65535. Now, we have a secondary check that will ensure that the seqno rolling over will not cause us to stop accepting DTMF. - (closes issue 0017571) - Reported by: mdeneen - Patches: - rtp_seqno_rollover.patch uploaded by mmichelson (license 60) - Tested by: richardf, maxochoa, JJCinAZ + (closes issue 0017571) + Reported by: mdeneen + Patches: + rtp_seqno_rollover.patch uploaded by mmichelson (license 60) + Tested by: richardf, maxochoa, JJCinAZ + + * Clear the AST_CDR_FLAG_DIALED flag for channels going into the pbx + via the G option in app_dial + + (closes issue 0017592) + Reported by: jamicque + Patches: + G-flag-cdr-fix1.diff uploaded by mnicholson (license 96) + Tested by: jamicque, mnicholson 2010-06-29 Leif Madsen <lmadsen@digium.com> diff --git a/apps/app_dial.c b/apps/app_dial.c index 48a4d3b01..d1a2bf49c 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1707,6 +1707,11 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags } if (chan && peer && ast_test_flag(&opts, OPT_GOTO) && !ast_strlen_zero(opt_args[OPT_ARG_GOTO])) { + /* chan and peer are going into the PBX, they both + * should probably get CDR records. */ + ast_clear_flag(chan->cdr, AST_CDR_FLAG_DIALED); + ast_clear_flag(peer->cdr, AST_CDR_FLAG_DIALED); + replace_macro_delimiter(opt_args[OPT_ARG_GOTO]); ast_parseable_goto(chan, opt_args[OPT_ARG_GOTO]); /* peer goes to the same context and extension as chan, so just copy info from chan*/ |