diff options
author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-22 22:15:55 +0000 |
---|---|---|
committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-22 22:15:55 +0000 |
commit | a455d6aa86a8b5577b6509e5c00278e211a6ac5b (patch) | |
tree | 0347873796edca65da1e9409c6d8158faa326a3e /main/channel.c | |
parent | f0c8afa9aea9761fe34d6370080a17727497fd21 (diff) |
Merged revisions 258671,258675 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r258671 | mnicholson | 2010-04-22 16:57:59 -0500 (Thu, 22 Apr 2010) | 32 lines
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
................
r258675 | mnicholson | 2010-04-22 17:11:23 -0500 (Thu, 22 Apr 2010) | 2 lines
Fix previous commit.
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@258676 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
-rw-r--r-- | main/channel.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index e357fe3b8..e77498491 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3920,8 +3920,19 @@ struct ast_channel *__ast_request_and_dial(const char *type, int format, void *d break; 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; @@ -4052,7 +4063,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); |