[asterisk-commits] file: trunk r73983 - in /trunk: ./ main/cdr.c

[SVN commits to the Asterisk project]

Author: file
Date: Sun Jul  8 22:14:34 2007
New Revision: 73983

URL: http://svn.digium.com/view/asterisk?view=rev&rev=73983
Log:
Merged revisions 73980 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r73980 | file | 2007-07-09 00:13:19 -0300 (Mon, 09 Jul 2007) | 2 lines

Give Agent channel names priority when doing CDR merging. (issue #10011 reported by krtorio)

........

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

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

Modified: trunk/main/cdr.c
URL: http://svn.digium.com/view/asterisk/trunk/main/cdr.c?view=diff&rev=73983&r1=73982&r2=73983
==============================================================================
--- trunk/main/cdr.c (original)
+++ trunk/main/cdr.c Sun Jul  8 22:14:34 2007
@@ -622,7 +622,7 @@
 		ast_copy_string(to->dstchannel, from->dstchannel, sizeof(to->dstchannel));
 		from->dstchannel[0] = 0; /* theft */
 	}
-	if (ast_strlen_zero(to->channel) && !ast_strlen_zero(from->channel)) {
+	if (!ast_strlen_zero(from->channel) && (ast_strlen_zero(to->channel) || !strncasecmp(from->channel, "Agent/", 6))) {
 		ast_copy_string(to->channel, from->channel, sizeof(to->channel));
 		from->channel[0] = 0; /* theft */
 	}