aboutsummaryrefslogtreecommitdiffstats
path: root/main/features.c
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-10 22:14:41 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-10 22:14:41 +0000
commitc177c0d35c053a96a3f920a19fe2dfb1eb80f5d7 (patch)
tree03449bb78bb48c76f4846ee50e47dd40dc172ac4 /main/features.c
parentc3969e3105ecb5eeda72040da282f8f88ed95951 (diff)
Merged revisions 142475 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r142475 | murf | 2008-09-10 16:11:27 -0600 (Wed, 10 Sep 2008) | 38 lines Merged revisions 142474 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142474 | murf | 2008-09-10 15:58:17 -0600 (Wed, 10 Sep 2008) | 30 lines (closes issue #12318) Reported by: krtorio I made a small change to the code that handles local channel situations. In that code, I copy the answer time from the peer cdr, to the bridge_cdr, but I wasn't also copying the disposition from the peer cdr. So, Now I copy the disposition, and I've tested against these cases: 1. phone 1 never answers the phone; no cdr is generated at all. this should show up as a manager command failure or something. 2. phone 2 never answers. CDR is generated, says NO ANSWER 3. phone 2 is busy. CDR is generated, says BUSY 4. phone 2 answers: CDR is generated, times are correct; disposition is ANSWERED, which is correct. The start time is the time that the manager dialed the first phone. The answer time is the time the second phone picks up. I purposely left the cid and src fields blank; since this call really originates from the manager, there is no 'easy' data to put in these fields. If you feel strongly that these fields should be filled in, re-open this bug and I'll dig further. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@142477 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
-rw-r--r--main/features.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/features.c b/main/features.c
index f13c5d124..7c12a1420 100644
--- a/main/features.c
+++ b/main/features.c
@@ -1976,6 +1976,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
if (peer->cdr && !ast_tvzero(peer->cdr->answer)) {
bridge_cdr->answer = peer->cdr->answer;
chan->cdr->answer = peer->cdr->answer;
+ bridge_cdr->disposition = peer->cdr->disposition;
+ chan->cdr->disposition = peer->cdr->disposition;
} else {
ast_cdr_answer(bridge_cdr);
ast_cdr_answer(chan->cdr); /* for the sake of cli status checks */