diff options
author | Scott Griepentrog <sgriepentrog@digium.com> | 2014-03-07 15:47:55 +0000 |
---|---|---|
committer | Scott Griepentrog <sgriepentrog@digium.com> | 2014-03-07 15:47:55 +0000 |
commit | 80ef9a21b9d91ff0bafc304923bc29effa230b00 (patch) | |
tree | a67db39a4c17a4b01a87201ef37ffdc43189c119 /include/asterisk/bridge.h | |
parent | d3ac8b8a0e70049af7b5552c4dfd8adc2cc5df11 (diff) |
uniqueid: channel linkedid, ami, ari object creation with id's
Much needed was a way to assign id to objects on creation, and
much change was necessary to accomplish it. Channel uniqueids
and linkedids are split into separate string and creation time
components without breaking linkedid propgation. This allowed
the uniqueid to be specified by the user interface - and those
values are now carried through to channel creation, adding the
assignedids value to every function in the chain including the
channel drivers. For local channels, the second channel can be
specified or left to default to a ;2 suffix of first. In ARI,
bridge, playback, and snoop objects can also be created with a
specified uniqueid.
Along the way, the args order to allocating channels was fixed
in chan_mgcp and chan_gtalk, and linkedid is no longer lost as
masquerade occurs.
(closes issue ASTERISK-23120)
Review: https://reviewboard.asterisk.org/r/3191/
........
Merged revisions 410157 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/bridge.h')
-rw-r--r-- | include/asterisk/bridge.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asterisk/bridge.h b/include/asterisk/bridge.h index 0706b3aed..d8c27f4f2 100644 --- a/include/asterisk/bridge.h +++ b/include/asterisk/bridge.h @@ -333,6 +333,7 @@ extern struct ast_bridge_methods ast_bridge_base_v_table; * \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) + * \param name id Unique ID given to the bridge by its creator (optional) * * \retval a pointer to a new bridge on success * \retval NULL on failure @@ -347,7 +348,7 @@ extern struct ast_bridge_methods ast_bridge_base_v_table; * This creates a no frills two party bridge that will be * destroyed once one of the channels hangs up. */ -struct ast_bridge *ast_bridge_base_new(uint32_t capabilities, unsigned int flags, const char *creator, const char *name); +struct ast_bridge *ast_bridge_base_new(uint32_t capabilities, unsigned int flags, const char *creator, const char *name, const char *id); /*! * \brief Try locking the bridge. |