kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 01:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 258671,258675 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@258705 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2010-04-22 22:24:09 +00:00
parent 8448c7b538
commit 85edb0cd54
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/channel.c
View File

@@ -3892,8 +3892,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;
@@ -4024,7 +4035,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);