diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-22 21:43:38 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-22 21:43:38 +0000 |
commit | 5faebd5bd6225add10239259256ed194adb667a5 (patch) | |
tree | 3f12787397e31b22f224d78f3ee893f5b3527b44 | |
parent | 2b16792999e3ca696f3cad9db46de64bcbc3070c (diff) |
Merged revisions 14234 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r14234 | file | 2006-03-22 17:38:32 -0400 (Wed, 22 Mar 2006) | 2 lines
Issue #5918 - Disposition showing FAILED even though call is answered successfully (Reported by tracinet)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@14235 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | cdr.c | 6 | ||||
-rw-r--r-- | include/asterisk/cdr.h | 4 |
2 files changed, 6 insertions, 4 deletions
@@ -515,8 +515,10 @@ void ast_cdr_failed(struct ast_cdr *cdr) chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>"; if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED)) ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan); - if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) - cdr->disposition = AST_CDR_FAILED; + if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) { + if (cdr->disposition < AST_CDR_FAILED) + cdr->disposition = AST_CDR_FAILED; + } cdr = cdr->next; } } diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h index e6685509a..b08f0fd7b 100644 --- a/include/asterisk/cdr.h +++ b/include/asterisk/cdr.h @@ -32,8 +32,8 @@ #define AST_CDR_NOANSWER (1 << 0) #define AST_CDR_BUSY (1 << 1) -#define AST_CDR_ANSWERED (1 << 2) -#define AST_CDR_FAILED (1 << 3) +#define AST_CDR_FAILED (1 << 2) +#define AST_CDR_ANSWERED (1 << 3) /*! AMA Flags */ #define AST_CDR_OMIT (1) |