diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-07-09 03:14:34 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-07-09 03:14:34 +0000 |
| commit | 56503686c9de910d0ba84f00e2badd94cb107628 (patch) | |
| tree | 4eca4065b309542d13913cda29f6ef05147166d7 /main/cdr.c | |
| parent | f80af1ff80aa3e018f33770747ab21111b577feb (diff) | |
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)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/cdr.c')
| -rw-r--r-- | main/cdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/cdr.c b/main/cdr.c index 90e2da67e..e5c96dbec 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -622,7 +622,7 @@ void ast_cdr_merge(struct ast_cdr *to, struct ast_cdr *from) 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 */ } |