diff options
| author | Jonathan Rose <jrose@digium.com> | 2013-12-17 23:25:49 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2013-12-17 23:25:49 +0000 |
| commit | b0bb03e916da4b4a37aa65b694e3aa1cecee8648 (patch) | |
| tree | 697d4ba1137ca3b28fc79d1c976b2e342274c1fe /include/asterisk/bridge_internal.h | |
| parent | 91d0f305061a6111d9996750c04d54daa67b67bb (diff) | |
bridging: Give bridges a name and a known creator
Bridges have two new optional properties, a creator and a name.
Certain consumers of bridges will automatically provide bridges that
they create with these properties. Examples include app_bridgewait,
res_parking, app_confbridge, and app_agent_pool. In addition, a name
may now be provided as an argument to the POST function for creating
new bridges via ARI.
(closes issue AFS-47)
Review: https://reviewboard.asterisk.org/r/3070/
........
Merged revisions 404042 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404043 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/bridge_internal.h')
| -rw-r--r-- | include/asterisk/bridge_internal.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asterisk/bridge_internal.h b/include/asterisk/bridge_internal.h index 871abb8c5..e9726a1ab 100644 --- a/include/asterisk/bridge_internal.h +++ b/include/asterisk/bridge_internal.h @@ -87,6 +87,8 @@ struct ast_bridge *bridge_alloc(size_t size, const struct ast_bridge_methods *v_ * \param self Bridge to operate upon. (Tolerates a NULL pointer) * \param capabilities The capabilities that we require to be used on the bridge * \param flags Flags that will alter the behavior of the bridge + * \param creator Entity that created the bridge (optional) + * \param name Name given to the bridge by its creator (optional, requires named creator) * * \retval self on success * \retval NULL on failure, self is already destroyed @@ -96,13 +98,13 @@ struct ast_bridge *bridge_alloc(size_t size, const struct ast_bridge_methods *v_ * \code * struct ast_bridge *bridge; * bridge = bridge_alloc(sizeof(*bridge), &ast_bridge_base_v_table); - * bridge = bridge_base_init(bridge, AST_BRIDGE_CAPABILITY_1TO1MIX, AST_BRIDGE_FLAG_DISSOLVE_HANGUP); + * bridge = bridge_base_init(bridge, AST_BRIDGE_CAPABILITY_1TO1MIX, AST_BRIDGE_FLAG_DISSOLVE_HANGUP, NULL, NULL); * \endcode * * This creates a no frills two party bridge that will be * destroyed once one of the channels hangs up. */ -struct ast_bridge *bridge_base_init(struct ast_bridge *self, uint32_t capabilities, unsigned int flags); +struct ast_bridge *bridge_base_init(struct ast_bridge *self, uint32_t capabilities, unsigned int flags, const char *creator, const char *name); /*! * \internal |