kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-12 04:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 182525 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r182525 | kpfleming | 2009-03-17 09:38:11 -0500 (Tue, 17 Mar 2009) | 11 lines
  
  Improve behavior of ast_answer() to not lose incoming frames
  
  ast_answer(), when supplied a delay before returning to the caller, use ast_safe_sleep() to implement the delay. Unfortunately during this time any incoming frames are discarded, which is problematic for T.38 re-INVITES and other sorts of channel operations.
  
  When a delay is not passed to ast_answer(), it still delays for up to 500 milliseconds, waiting for media to arrive. Again, though, it discards any control frames, or non-voice media frames.
  
  This patch rectifies this situation, by storing all incoming frames during the delay period on a list, and then requeuing them onto the channel before returning to the caller.
  
  http://reviewboard.digium.com/r/196/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@182527 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2009-03-17 14:39:50 +00:00
parent 4a3c902f41
commit 4d1d39c1e7
3 changed files with 157 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/features.c
View File

@@ -2406,8 +2406,11 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
config->firstpass = 1;
/* Answer if need be */
if (ast_answer(chan))
return -1;
if (chan->_state != AST_STATE_UP) {
if (ast_raw_answer(chan, 1)) {
return -1;
}
}
ast_copy_string(orig_channame,chan->name,sizeof(orig_channame));
ast_copy_string(orig_peername,peer->name,sizeof(orig_peername));