aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-12 19:06:30 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-12 19:06:30 +0000
commit752f34fe8a637191d5f3b2015f0888fb0771edc8 (patch)
tree26e4c546da8b09724368c35d08bc16581d26cd2a
parent61eb980e16df594d703f98ee21e8345b620edee7 (diff)
Merge changes from issue 17592.
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.2.10-rc2@275764 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--ChangeLog9
-rw-r--r--apps/app_dial.c5
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d56065c3..fb96bbb87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,15 @@
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>
* Release Asterisk 1.6.2.10-rc1
diff --git a/apps/app_dial.c b/apps/app_dial.c
index a12880aae..61b3fa105 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -2007,6 +2007,11 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
}
if (chan && peer && ast_test_flag64(&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*/