[asterisk-commits] mnicholson: branch 1.6.1 r230630 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Fri Nov 20 15:08:50 2009
New Revision: 230630

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=230630
Log:
Merged revisions 230628 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r230628 | mnicholson | 2009-11-20 15:01:10 -0600 (Fri, 20 Nov 2009) | 15 lines
  
  Merged revisions 230627 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r230627 | mnicholson | 2009-11-20 14:53:06 -0600 (Fri, 20 Nov 2009) | 8 lines
    
    Copy the peer CDR's userfield to the bridge CDR if it exists.  This is necessary for the recordagentcalls option in chan_agent to store the recorded file name in the bridge CDR.
    
    (closes issue #14590)
    Reported by: msetim
    Patches:
          queue_agent_userfield.patch uploaded by Laureano (license 265)
    Tested by: Laureano, mnicholson
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/features.c?view=diff&rev=230630&r1=230629&r2=230630
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Fri Nov 20 15:08:50 2009
@@ -2478,6 +2478,10 @@
 			bridge_cdr = ast_cdr_dup(chan_cdr);
 			ast_copy_string(bridge_cdr->lastapp, S_OR(chan->appl, ""), sizeof(bridge_cdr->lastapp));
 			ast_copy_string(bridge_cdr->lastdata, S_OR(chan->data, ""), sizeof(bridge_cdr->lastdata));
+			if (peer_cdr && !ast_strlen_zero(peer_cdr->userfield)) {
+				ast_copy_string(bridge_cdr->userfield, peer_cdr->userfield, sizeof(bridge_cdr->userfield));
+			}
+
 		} else {
 			/* better yet, in a xfer situation, find out why the chan cdr got zapped (pun unintentional) */
 			bridge_cdr = ast_cdr_alloc(); /* this should be really, really rare/impossible? */