kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undo r414122

Browse Source 
The Test Suite caught a few problems, undoing until those are resolved


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@414137 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2014-05-19 01:09:39 +00:00
parent dc0de28db0
commit ec93bb462b
7 changed files with 8 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bridges/bridge_native_rtp.c
View File

@@ -230,10 +230,8 @@ static void native_rtp_bridge_stop(struct ast_bridge *bridge, struct ast_channel
break;
case AST_RTP_GLUE_RESULT_REMOTE:
if (!target) {
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)) {
glue0->update_peer(c0->chan, NULL, NULL, NULL, NULL, 0);
if (glue1) {
glue1->update_peer(c1->chan, NULL, NULL, NULL, NULL, 0);
}
} else {
@@ -487,9 +485,8 @@ static void native_rtp_bridge_leave(struct ast_bridge *bridge, struct ast_bridge
}
/* Direct RTP may have occurred, tear it down */
if (ast_channel_is_leaving_bridge(bridge_channel->chan)) {
glue->update_peer(bridge_channel->chan, NULL, NULL, NULL, NULL, 0);
}
glue->update_peer(bridge_channel->chan, NULL, NULL, NULL, NULL, 0);
native_rtp_bridge_stop(bridge, NULL);
}