From 8c41f2db8290ffc31d1bb35d00098a97288fe869 Mon Sep 17 00:00:00 2001
From: Matthew Nicholson <mnicholson@digium.com>
Date: Thu, 22 Apr 2010 21:57:59 +0000
Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@258671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/cdr.c | 9 +++------
main/channel.c | 19 ++++++++++++++++++-
main/features.c | 5 +++++
3 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/main/cdr.c b/main/cdr.c
index 8f25c84b61..db277af29c 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;
}
diff --git a/main/channel.c b/main/channel.c
index dfa61b23be..712da3d2b3 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -4660,7 +4660,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);
@@ -6142,6 +6141,24 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
ast_clear_flag(c0, AST_FLAG_NBRIDGE);
ast_clear_flag(c1, AST_FLAG_NBRIDGE);
+ case AST_CONTROL_BUSY:
+ ast_cdr_busy(chan->cdr);
+ *outstate = f->subclass;
+ timeout = 0;
+ break;
+
+ case AST_CONTROL_CONGESTION:
+ ast_cdr_failed(chan->cdr);
+ *outstate = f->subclass;
+ timeout = 0;
+ break;
+
+ case AST_CONTROL_ANSWER:
+ ast_cdr_answer(chan->cdr);
+ *outstate = f->subclass;
+ timeout = 0; /* trick to force exit from the while() */
+ break;
+
if (c0->_softhangup == AST_SOFTHANGUP_UNBRIDGE || c1->_softhangup == AST_SOFTHANGUP_UNBRIDGE)
continue;
diff --git a/main/features.c b/main/features.c
index 1aaf33a25e..0a26ad1c07 100644
--- a/main/features.c
+++ b/main/features.c
@@ -3098,6 +3098,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);
}
ast_cel_report_event(chan, AST_CEL_BRIDGE_START, NULL, NULL, NULL);
for (;;) {
--
GitLab