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

bridge: During a smart bridge operation provide a more complete bridge to the old technology.

Browse Source 
When a smart bridge operation occurs and a bridge transitions from one
technology to another the old technology is provided the channels formerly
in it and told that they are leaving. Unfortunately the bridge provided
along with them is incomplete. The bridge, despite there being channels in it,
contains none. This forces technology implementations to have additional
logic when channels are leaving or to store their own duplicated
state.

This change makes the bridge more complete so it contains the expected
channels. Now that the bridge is complete special logic within
bridge_native_rtp is no longer needed and has been removed.

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

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@425243 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2014-10-10 20:48:03 +00:00
parent b8aed5b14d
commit 743ad19699
2 changed files with 42 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
main/bridge.c
View File

@@ -1139,28 +1139,55 @@ static int smart_bridge_operation(struct ast_bridge *bridge)
return -1;
}
/* To ensure that things are sane for the old technology move the channels it
* expects to the dummy bridge
*/
AST_LIST_TRAVERSE_SAFE_BEGIN(&bridge->channels, bridge_channel, entry) {
if (bridge_channel->just_joined) {
continue;
}
ast_debug(1, "Bridge %s: moving %p(%s) to dummy bridge temporarily\n",
bridge->uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan));
AST_LIST_REMOVE_CURRENT(entry);
AST_LIST_INSERT_TAIL(&dummy_bridge.channels, bridge_channel, entry);
dummy_bridge.num_channels++;
if (ast_test_flag(&bridge_channel->features->feature_flags, AST_BRIDGE_CHANNEL_FLAG_LONELY)) {
dummy_bridge.num_lonely++;
}
if (!bridge_channel->suspended) {
dummy_bridge.num_active++;
}
}
AST_LIST_TRAVERSE_SAFE_END;
/* Take all the channels out of the old technology */
AST_LIST_TRAVERSE_SAFE_BEGIN(&dummy_bridge.channels, bridge_channel, entry) {
ast_debug(1, "Bridge %s: %p(%s) is leaving %s technology (dummy)\n",
dummy_bridge.uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan),
old_technology->name);
if (old_technology->leave) {
old_technology->leave(&dummy_bridge, bridge_channel);
}
AST_LIST_REMOVE_CURRENT(entry);
AST_LIST_INSERT_TAIL(&bridge->channels, bridge_channel, entry);
dummy_bridge.num_channels--;
if (ast_test_flag(&bridge_channel->features->feature_flags, AST_BRIDGE_CHANNEL_FLAG_LONELY)) {
dummy_bridge.num_lonely--;
}
if (!bridge_channel->suspended) {
dummy_bridge.num_active--;
}
}
AST_LIST_TRAVERSE_SAFE_END;
ast_debug(1, "Bridge %s: calling %s technology stop\n",
dummy_bridge.uniqueid, old_technology->name);
if (old_technology->stop) {
old_technology->stop(&dummy_bridge);
}
/*
* Move existing channels over to the new technology and
* complete joining any new channels to the bridge.
*/
/* Add any new channels or re-add existing channels to the bridge. */
AST_LIST_TRAVERSE(&bridge->channels, bridge_channel, entry) {
if (!bridge_channel->just_joined) {
/* Take existing channel from the old technology. */
ast_debug(1, "Bridge %s: %p(%s) is leaving %s technology (dummy)\n",
dummy_bridge.uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan),
old_technology->name);
if (old_technology->leave) {
old_technology->leave(&dummy_bridge, bridge_channel);
}
}
/* Add any new channels or re-add an existing channel to the bridge. */
bridge_channel_complete_join(bridge, bridge_channel);
}