kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-21 04:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bridging: Allow channels to define bridging hooks

Browse Source 
This patch allows the current owner of a channel to define various
feature hooks to be made available once the channel has entered a
bridge. This includes any hooks that are setup on the
ast_bridge_features struct such as DTMF hooks, bridge event hooks
(join, leave, etc.), and interval hooks.

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@417361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2014-06-26 12:43:47 +00:00
parent 22e62ac6f6
commit e977b7936b
6 changed files with 506 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/bridge_channel.c
View File

@@ -2187,6 +2187,7 @@ static void bridge_channel_event_join_leave(struct ast_bridge_channel *bridge_ch
int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel)
{
int res = 0;
struct ast_bridge_features *channel_features;
ast_format_copy(&bridge_channel->read_format, ast_channel_readformat(bridge_channel->chan));
ast_format_copy(&bridge_channel->write_format, ast_channel_writeformat(bridge_channel->chan));
@@ -2201,8 +2202,8 @@ int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel)
*/
ast_bridge_lock(bridge_channel->bridge);
/* Make sure we're still good to be put into a bridge */
ast_channel_lock(bridge_channel->chan);
/* Make sure we're still good to be put into a bridge */
if (ast_channel_internal_bridge(bridge_channel->chan)
|| ast_test_flag(ast_channel_flags(bridge_channel->chan), AST_FLAG_ZOMBIE)) {
ast_channel_unlock(bridge_channel->chan);
@@ -2214,6 +2215,12 @@ int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel)
return -1;
}
ast_channel_internal_bridge_set(bridge_channel->chan, bridge_channel->bridge);
/* Attach features requested by the channel */
channel_features = ast_channel_feature_hooks_get(bridge_channel->chan);
if (channel_features) {
ast_bridge_features_merge(bridge_channel->features, channel_features);
}
ast_channel_unlock(bridge_channel->chan);
/* Add the jitterbuffer if the channel requires it */