]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 275028 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Fri, 9 Jul 2010 16:06:43 +0000 (16:06 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Fri, 9 Jul 2010 16:06:43 +0000 (16:06 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

................
  r275028 | mnicholson | 2010-07-09 11:05:58 -0500 (Fri, 09 Jul 2010) | 15 lines

  Merged revisions 275027 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r275027 | mnicholson | 2010-07-09 11:04:21 -0500 (Fri, 09 Jul 2010) | 8 lines

    Clear the AST_CDR_FLAG_DIALED flag for channels going into the pbx via the G option in app_dial

    (closes issue #17592)
    Reported by: jamicque
    Patches:
          G-flag-cdr-fix1.diff uploaded by mnicholson (license 96)
    Tested by: jamicque, mnicholson
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@275029 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_dial.c

index a12880aaeadece3cacce6ffc9ae46a0b01557ae4..61b3fa105bb14ecc09d6a3db0f123f0ebffe1dcf 100644 (file)
@@ -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*/