diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-22 21:57:59 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-22 21:57:59 +0000 |
| commit | 8cb1ccde85ca4acd108be010c5ebaeee6be26e52 (patch) | |
| tree | 3f49bb608f642f065ff7ce5c2c0be64486c7acb8 /main/cdr.c | |
| parent | 9c4e095194143632fa08aa9301d1d7f2e03a400c (diff) | |
Merged revisions 193391,258670 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r193391 | mnicholson | 2009-05-08 16:01:25 -0500 (Fri, 08 May 2009) | 8 lines
Set the proper disposition on originated calls.
(closes issue #14167)
Reported by: jpt
Patches:
call-file-missing-cdr2.diff uploaded by mnicholson (license 96)
Tested by: dlotina, rmartinez, mnicholson
........
r258670 | mnicholson | 2010-04-22 16:49:07 -0500 (Thu, 22 Apr 2010) | 11 lines
Fix broken CDR behavior.
This change allows a CDR record previously marked with disposition ANSWERED to be set as BUSY or NO ANSWER.
Additionally this change partially reverts r235635 and does not set the AST_CDR_FLAG_ORIGINATED flag on CDRs generated from ast_call(). To preserve proper CDR behavior, the AST_CDR_FLAG_DIALED flag is now cleared from all brige CDRs in ast_bridge_call().
(closes issue #16797)
Reported by: VarnishedOtter
Tested by: mnicholson
........
(closes issue #16222)
Reported by: telles
Tested by: mnicholson
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@258671 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/cdr.c')
| -rw-r--r-- | main/cdr.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/main/cdr.c b/main/cdr.c index 8f25c84b6..db277af29 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -740,8 +740,7 @@ void ast_cdr_busy(struct ast_cdr *cdr) for (; cdr; cdr = cdr->next) { if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) { check_post(cdr); - if (cdr->disposition < AST_CDR_BUSY) - cdr->disposition = AST_CDR_BUSY; + cdr->disposition = AST_CDR_BUSY; } } } @@ -765,10 +764,8 @@ void ast_cdr_noanswer(struct ast_cdr *cdr) while (cdr) { if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) { 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 (cdr->disposition < AST_CDR_NOANSWER) - cdr->disposition = AST_CDR_NOANSWER; + check_post(cdr); + cdr->disposition = AST_CDR_NOANSWER; } cdr = cdr->next; } |