diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-22 21:49:07 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-22 21:49:07 +0000 |
| commit | 6d9bb360afac9ad013e2ff1297215b25463fb40e (patch) | |
| tree | 61148cde32108fc49528265788786b32f4e99a22 | |
| parent | 288f94f8375c554d255483a175007aa0ad9f6205 (diff) | |
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
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@258670 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/cdr.c | 9 | ||||
| -rw-r--r-- | main/channel.c | 1 | ||||
| -rw-r--r-- | res/res_features.c | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/main/cdr.c b/main/cdr.c index b347bcc4d..7868c1a64 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -720,8 +720,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; } } } @@ -743,11 +742,9 @@ void ast_cdr_noanswer(struct ast_cdr *cdr) while (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); + check_post(cdr); if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) { - if (cdr->disposition < AST_CDR_NOANSWER) - cdr->disposition = AST_CDR_NOANSWER; + cdr->disposition = AST_CDR_NOANSWER; } cdr = cdr->next; } diff --git a/main/channel.c b/main/channel.c index eb4aa05d9..3c02beda6 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3480,7 +3480,6 @@ int ast_call(struct ast_channel *chan, char *addr, int timeout) if (!ast_test_flag(chan, AST_FLAG_ZOMBIE) && !ast_check_hangup(chan)) { if (chan->cdr) { ast_set_flag(chan->cdr, AST_CDR_FLAG_DIALED); - ast_set_flag(chan->cdr, AST_CDR_FLAG_ORIGINATED); } if (chan->tech->call) res = chan->tech->call(chan, addr, timeout); diff --git a/res/res_features.c b/res/res_features.c index 7d53d185d..8690d3ab5 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1847,6 +1847,11 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast ast_set_flag(peer_cdr, AST_CDR_FLAG_BRIDGED); } } + /* the DIALED flag may be set if a dialed channel is transfered + * and then bridged to another channel. In order for the + * bridge CDR to be written, the DIALED flag must not be + * present. */ + ast_clear_flag(bridge_cdr, AST_CDR_FLAG_DIALED); } for (;;) { |