diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-09 03:13:19 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-09 03:13:19 +0000 |
commit | 2307ee2caaae1798efc20542bf9b73086299d48b (patch) | |
tree | 28b7ef8f402290443090c11276be1f8842f85226 /main | |
parent | 67afe234adb90b30cbfc9c60af83267fe1087ed7 (diff) |
Give Agent channel names priority when doing CDR merging. (issue #10011 reported by krtorio)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@73980 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-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 6e8463a98..20d31bd4b 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -620,7 +620,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 */ } |