[asterisk-commits] file: branch 1.4 r73980 - /branches/1.4/main/cdr.c

[SVN commits to the Asterisk project]

Author: file
Date: Sun Jul  8 22:13:19 2007
New Revision: 73980

URL: http://svn.digium.com/view/asterisk?view=rev&rev=73980
Log:
Give Agent channel names priority when doing CDR merging. (issue #10011 reported by krtorio)

Modified:
    branches/1.4/main/cdr.c

Modified: branches/1.4/main/cdr.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/cdr.c?view=diff&rev=73980&r1=73979&r2=73980
==============================================================================
--- branches/1.4/main/cdr.c (original)
+++ branches/1.4/main/cdr.c Sun Jul  8 22:13:19 2007
@@ -620,7 +620,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 */
 	}