kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

bridges/bridge_native_rtp: Reconfigure bridge on removal of framehook

Browse Source 
This patch is a re-do of r414122.

When r414122 was merged, a major problem with it was uncovered. UNBRIDGE soft
hangup flags have a catastrophic effect on the pbx core if they leak out from
the bridge layer: the channel gets hung up. With the number of threads
involved in a blind transfer, and with the initial patch, it was likely that
this would occur. This caused a large number of test failures

This patch is nearly identical with the one proposed in r414122, save for the
following changes:
 - We explicitly clear the UNBRIDGE flag when setting an after goto on a
   channel in a bridge
 - Defensively, if we encounter an UNBRIDGE flag in the pbx core, we handle it

https://reviewboard.asterisk.org/r/3585/
........

Merged revisions 415443 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@415444 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2014-06-08 18:12:53 +00:00
parent 30b7ba05e7
commit 20a14e568f
7 changed files with 54 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bridges/bridge_native_rtp.c
View File

@@ -234,8 +234,10 @@ static void native_rtp_bridge_stop(struct ast_bridge *bridge, struct ast_channel
break;
case AST_RTP_GLUE_RESULT_REMOTE:
if (!target) {
glue0->update_peer(c0->chan, NULL, NULL, NULL, NULL, 0);
if (glue1) {
if (ast_channel_is_leaving_bridge(c0->chan)) {
glue0->update_peer(c0->chan, NULL, NULL, NULL, NULL, 0);
}
if (glue1 && ast_channel_is_leaving_bridge(c1->chan)) {
glue1->update_peer(c1->chan, NULL, NULL, NULL, NULL, 0);
}
} else {
@@ -488,8 +490,10 @@ static void native_rtp_bridge_leave(struct ast_bridge *bridge, struct ast_bridge
ast_rtp_instance_set_bridged(tinstance, NULL);
}
/* Direct RTP may have occurred, tear it down */
glue->update_peer(bridge_channel->chan, NULL, NULL, NULL, NULL, 0);
if (ast_channel_is_leaving_bridge(bridge_channel->chan)) {
/* Direct RTP may have occurred, tear it down */
glue->update_peer(bridge_channel->chan, NULL, NULL, NULL, NULL, 0);
}
native_rtp_bridge_stop(bridge, NULL);
}