summaryrefslogtreecommitdiff
path: root/include/asterisk
diff options
context:
space:
mode:
authorJonathan Rose <jrose@digium.com>2013-08-09 17:22:28 +0000
committerJonathan Rose <jrose@digium.com>2013-08-09 17:22:28 +0000
commit6fe21ef48eede571957863484a203124a6118d9f (patch)
treea267da3dde4b48ff8065f552958de2026bf9a086 /include/asterisk
parent6eec8a44e7a9158fff224957ffe93260f513835c (diff)
bridge_channel: Support the lonely flag and make ARI use it.
The lonely flag is an optional flag for bridge channels that will make them leave a bridge when a channel leaves if only lonely channels are in the bridge at that point. This is useful for things like ending recording and playback channels when they cease to be interacting with other channels in the bridge. (closes issue ASTERISK-22117) Reported by: Matt Jordan Review: https://reviewboard.asterisk.org/r/2721/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396497 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
-rw-r--r--include/asterisk/bridge.h2
-rw-r--r--include/asterisk/core_unreal.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/include/asterisk/bridge.h b/include/asterisk/bridge.h
index 5f22d37ef..3bcb1131a 100644
--- a/include/asterisk/bridge.h
+++ b/include/asterisk/bridge.h
@@ -295,6 +295,8 @@ struct ast_bridge {
unsigned int num_channels;
/*! Number of active channels in the bridge. */
unsigned int num_active;
+ /*! Number of channels with AST_BRIDGE_CHANNEL_FLAG_LONELY in the bridge. */
+ unsigned int num_lonely;
/*!
* \brief Count of the active temporary requests to inhibit bridge merges.
* Zero if merges are allowed.
diff --git a/include/asterisk/core_unreal.h b/include/asterisk/core_unreal.h
index c7a82ef92..9a8d2e1f5 100644
--- a/include/asterisk/core_unreal.h
+++ b/include/asterisk/core_unreal.h
@@ -215,13 +215,14 @@ void ast_unreal_call_setup(struct ast_channel *semi1, struct ast_channel *semi2)
*
* \param ast A member of the unreal channel being pushed
* \param bridge Which bridge we want to push the channel to
+ * \param flags Feature flags to be set on the bridge channel.
*
* \retval 0 if the channel is successfully imparted onto the bridge
* \retval -1 on failure
*
* \note This is equivalent to ast_call() on unreal based channel drivers that are designed to use it instead.
*/
-int ast_unreal_channel_push_to_bridge(struct ast_channel *ast, struct ast_bridge *bridge);
+int ast_unreal_channel_push_to_bridge(struct ast_channel *ast, struct ast_bridge *bridge, unsigned int flags);
/* ------------------------------------------------------------------- */