[asterisk-commits] twilson: trunk r358993 - in /trunk: ./ main/features.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Tue Mar 13 15:43:19 2012
New Revision: 358993

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=358993
Log:
Fix setting CDR variables in the hangup extension

A previous CDR fix for setting CDR variables during a bridge via
custom dialplan features broke setting CDR variables in the
hangup extension. This patch fixes the issue.

Review: https://reviewboard.asterisk.org/r/1794/
........

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

Merged revisions 358989 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=358993&r1=358992&r2=358993
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Tue Mar 13 15:43:19 2012
@@ -4408,8 +4408,10 @@
 	
 	/* 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 the channel CDR has been modified during the call, record the changes in the bridge cdr */
-	if (new_chan_cdr && bridge_cdr) {
+	/* If the channel CDR has been modified during the call, record the changes in the bridge cdr,
+	 * BUT, if we've gone through the h extension block above, the CDR got swapped so don't overwrite
+	 * what was done in the h extension. What a mess. This is why you never touch CDR code. */
+	if (new_chan_cdr && bridge_cdr && !h_context) {
 		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;