diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2009-03-17 14:38:11 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-03-17 14:38:11 +0000 |
| commit | d11b6386a5e69cb881a1fe251609c902212b495a (patch) | |
| tree | 04bbe09684dca69e5d8e0c1568b233240fa3abd5 /main/features.c | |
| parent | 9456bd1db520ce815871dd1d9f9b9bd5a373e8c5 (diff) | |
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/trunk@182525 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/main/features.c b/main/features.c index 4a8a3453a..91d90fe3a 100644 --- a/main/features.c +++ b/main/features.c @@ -2477,8 +2477,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)); |