[svn-commits] kharwell: branch 11 r408748 - in /branches/11: ./ apps/app_forkcdr.c

[SVN commits to the Digium repositories]

Author: kharwell
Date: Fri Feb 21 14:21:46 2014
New Revision: 408748

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=408748
Log:
app_forkcdr: ForkCDR v option does not keep CDR variables for subsequent records

When the 'v' option is specified to ForkCDR application, AST_CDR_FLAG_KEEP_VARS
flag is set only for the first CDR in the chain. So ForkCDR works fine with this
option only once. After the second and further calls to ForkCDR, CDR variables
get cleared on all CDRs besides the first one and moved to the newly forked CDR.
It always sets the KEEP_VARS flag on the first CDR in the chain, instead of the
most recent CDR which is used as a base to fork a new CDR.

This patch sets KEEP_VARS flag on the most recent CDR on the stack (the CDR used
for forking).

(closes issue ASTERISK-23260)
Reported by: zvision
Patches:
     app_forkcdr.diff uploaded by zvision (license 5755)
........

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

Modified:
    branches/11/   (props changed)
    branches/11/apps/app_forkcdr.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/11/apps/app_forkcdr.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/apps/app_forkcdr.c?view=diff&rev=408748&r1=408747&r2=408748
==============================================================================
--- branches/11/apps/app_forkcdr.c (original)
+++ branches/11/apps/app_forkcdr.c Fri Feb 21 14:21:46 2014
@@ -239,13 +239,14 @@
 {
 	int res = 0;
 	char *argcopy = NULL;
+	struct ast_cdr *cdr;
 	struct ast_flags flags = {0};
 	char *opts[OPT_ARG_ARRAY_SIZE];
 	AST_DECLARE_APP_ARGS(arglist,
 		AST_APP_ARG(options);
 	);
 
-	if (!ast_channel_cdr(chan)) {
+	if (!(cdr = ast_channel_cdr(chan))) {
 		ast_log(LOG_WARNING, "Channel does not have a CDR\n");
 		return 0;
 	}
@@ -261,9 +262,12 @@
 
 	if (!ast_strlen_zero(data)) {
 		int keepvars = ast_test_flag(&flags, OPT_KEEPVARS) ? 1 : 0;
-		ast_set2_flag(ast_channel_cdr(chan), keepvars, AST_CDR_FLAG_KEEP_VARS);
-	}
-	
+		while (cdr->next) {
+			cdr = cdr->next;
+		}
+		ast_set2_flag(cdr, keepvars, AST_CDR_FLAG_KEEP_VARS);
+	}
+
 	ast_cdr_fork(chan, flags, opts[OPT_ARG_VARSET]);
 
 	return res;