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

Add name argument to BridgeWait() so multiple holding bridges may be used

Browse Source 
Changes arguments for BridgeWait from BridgeWait(role, options) to
BridgeWait(bridge_name, role, options). Now multiple holding bridges may
be created and referenced by this application.

(closes issue ASTERISK-21922)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2642/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395509 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2013-07-26 16:34:56 +00:00
parent eec3150a8a
commit 9a46c1d019
5 changed files with 240 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/asterisk/bridge.h
View File

@@ -428,7 +428,8 @@ void ast_bridge_notify_masquerade(struct ast_channel *chan);
* \note Absolutely _NO_ locks should be held before calling
* this function since it blocks.
*
* \retval state that channel exited the bridge with
* \retval 0 if the channel successfully joined the bridge before it exited.
* \retval -1 if the channel failed to join the bridge
*
* Example usage:
*
@@ -447,7 +448,7 @@ void ast_bridge_notify_masquerade(struct ast_channel *chan);
* If channel specific features are enabled a pointer to the features structure
* can be specified in the features parameter.
*/
enum bridge_channel_state ast_bridge_join(struct ast_bridge *bridge,
int ast_bridge_join(struct ast_bridge *bridge,
struct ast_channel *chan,
struct ast_channel *swap,
struct ast_bridge_features *features,

5
include/asterisk/bridge_channel_internal.h
View File

@@ -117,11 +117,14 @@ void bridge_channel_internal_pull(struct ast_bridge_channel *bridge_channel);
*
* \param bridge_channel The Channel in the bridge
*
* \retval 0 bridge channel successfully joined the bridge
* \retval -1 bridge channel failed to join the bridge
*
* \note This API call starts the bridge_channel's processing of events while
* it is in the bridge. It will return when the channel has been instructed to
* leave the bridge.
*/
void bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel);
int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel);
/*!
* \internal