kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-08 22:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

bridge_native_rtp/bridge_channel: Fix direct media issues due to frame hook

Browse Source 
This patch fixes issues with direct media bridges that occur after a blind
transfer. These issues were caught by the (currently failing)
pjsip/transfers/blind_transfer/caller_direct_media test.

The test currently fails primarily for two reasons:
(1) When Bob and Charlie (the transfer target and the transfer destination)
    enter a bridge together, the framehook remains on the transfer target
    channel until both channels are in the bridge. As it consumes voice frames,
    the initial bridge type is a simple bridge. The framehook is removed when
    both channels are in the bridge; however, this does not currently cause the
    bridging framework to re-evaluate the bridge. This patch adds a
    AST_SOFTHANGUP_UNBRIDGE poke to the transfer target channel when a
    framehook is removed so the bridge can re-evaluate itself.

(2) When a channel leaves a native RTP bridge, it may be leaving due to being
    hung up. Sending a re-INVITE to a channel that is about to be hung up is
    not nice - in fact, there's a good chance we'll send the BYE request before
    the channel has had a chance to send back a 200 OK. To be somewhat nicer,
    this patch adds a function to channel.h that allows the bridging framework
    to query for exactly why a channel is leaving a bridge via the channel's
    soft hangup flags. This allows it to only send the re-INVITE if there's a
    chance the channel will survive the native bridging experience.

Review: https://reviewboard.asterisk.org/r/3535/



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@414122 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2014-05-18 20:29:12 +00:00
parent dd321a97da
commit dc0de28db0
6 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/channel.c
View File

@@ -10151,6 +10151,18 @@ int ast_channel_is_bridged(const struct ast_channel *chan)
return ast_channel_internal_bridge(chan) != NULL;
}
int ast_channel_is_leaving_bridge(struct ast_channel *chan)
{
int flags = ast_channel_softhangup_internal_flag(chan);
/* We test the flags independently here in case they are masked with
* actual "hangup" soft-hangup flags
*/
return (flags == AST_SOFTHANGUP_ASYNCGOTO ||
flags == AST_SOFTHANGUP_UNBRIDGE ||
flags == (AST_SOFTHANGUP_ASYNCGOTO | AST_SOFTHANGUP_UNBRIDGE));
}
struct ast_channel *ast_channel_bridge_peer(struct ast_channel *chan)
{
struct ast_channel *peer;