Make ForkCDR e option not set end time of the newly forked CDR log
authorJonathan Rose <jrose@digium.com>
Fri, 13 Apr 2012 16:12:17 +0000 (16:12 +0000)
committerJonathan Rose <jrose@digium.com>
Fri, 13 Apr 2012 16:12:17 +0000 (16:12 +0000)
Prior to this patch, ForkCDR's e option would immediately set the end time of the forked
CDR to that of the CDR that is being terminated. This resulted in the new CDR's end time
being roughly the same as it's beginning time (which is in turn roughly the same as the
original's end time).

(closes issue ASTERISK-19164)
Reported by: Steve Davies
Patches:
cdr_fork_end.v10.patch uploaded by Steve Davies (license 5012)
........

Merged revisions 362082 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 362084 from http://svn.asterisk.org/svn/asterisk/branches/10

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

apps/app_forkcdr.c

index c75553c..354792f 100644 (file)
@@ -191,6 +191,14 @@ static void ast_cdr_fork(struct ast_channel *chan, struct ast_flags optflags, ch
        if (!(newcdr = ast_cdr_dup_unique(cdr)))
                return;
        
+       /*
+        * End the original CDR if requested BEFORE appending the new CDR
+        * otherwise we incorrectly end the new CDR also.
+        */
+       if (ast_test_flag(&optflags, OPT_ENDCDR)) {
+               ast_cdr_end(cdr);
+       }
+
        ast_cdr_append(cdr, newcdr);
 
        if (!ast_test_flag(&optflags, OPT_NORESET))
@@ -218,9 +226,6 @@ static void ast_cdr_fork(struct ast_channel *chan, struct ast_flags optflags, ch
        if (ast_test_flag(&optflags, OPT_RESETDEST))
                newcdr->dstchannel[0] = 0;
        
-       if (ast_test_flag(&optflags, OPT_ENDCDR))
-               ast_cdr_end(cdr);
-
        if (ast_test_flag(&optflags, OPT_ANSLOCK))
                ast_set_flag(cdr, AST_CDR_FLAG_ANSLOCKED);