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/features.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/features.c')
| -rw-r--r-- | main/features.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/features.c b/main/features.c index 1aaf33a25..0a26ad1c0 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 (;;) { |