[svn-commits] twilson: trunk r356965 - in /trunk: ./ main/features.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Mon Feb 27 10:08:28 2012
New Revision: 356965

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=356965
Log:
Copy CDR variables when set during a bridge

This patch makes sure amaflags, accountcode, and userfield get copied
to the bridge CDR when set during a bridge (like via a custom feature).

(closes issue ASTERISK-16990)
Review: https://reviewboard.asterisk.org/r/1721/
........

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

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

Modified:
    trunk/   (props changed)
    trunk/main/features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=356965&r1=356964&r2=356965
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Mon Feb 27 10:08:28 2012
@@ -4403,8 +4403,16 @@
 	
 	/* obey the NoCDR() wishes. -- move the DISABLED flag to the bridge CDR if it was set on the channel during the bridge... */
 	new_chan_cdr = pick_unlocked_cdr(ast_channel_cdr(chan)); /* the proper chan cdr, if there are forked cdrs */
-	if (bridge_cdr && new_chan_cdr && ast_test_flag(new_chan_cdr, AST_CDR_FLAG_POST_DISABLED))
-		ast_set_flag(bridge_cdr, AST_CDR_FLAG_POST_DISABLED);
+	/* If the channel CDR has been modified during the call, record the changes in the bridge cdr */
+	if (new_chan_cdr && bridge_cdr) {
+		ast_cdr_copy_vars(bridge_cdr, new_chan_cdr);
+		ast_copy_string(bridge_cdr->userfield, new_chan_cdr->userfield, sizeof(bridge_cdr->userfield));
+		bridge_cdr->amaflags = new_chan_cdr->amaflags;
+		ast_copy_string(bridge_cdr->accountcode, new_chan_cdr->accountcode, sizeof(bridge_cdr->accountcode));
+		if (ast_test_flag(new_chan_cdr, AST_CDR_FLAG_POST_DISABLED)) {
+			ast_set_flag(bridge_cdr, AST_CDR_FLAG_POST_DISABLED);
+		}
+	}
 
 	/* we can post the bridge CDR at this point */
 	if (bridge_cdr) {