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 /apps/confbridge | |
| 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 'apps/confbridge')
| -rw-r--r-- | apps/confbridge/conf_chan_announce.c | 4 | ||||
| -rw-r--r-- | apps/confbridge/conf_chan_record.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/confbridge/conf_chan_announce.c b/apps/confbridge/conf_chan_announce.c index 952ef988e..189a63218 100644 --- a/apps/confbridge/conf_chan_announce.c +++ b/apps/confbridge/conf_chan_announce.c @@ -77,7 +77,7 @@ static void announce_pvt_destructor(void *vdoomed) doomed->bridge = NULL; } -static struct ast_channel *announce_request(const char *type, struct ast_format_cap *cap, const struct ast_channel *requestor, const char *data, int *cause) +static struct ast_channel *announce_request(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *data, int *cause) { struct ast_channel *chan; const char *conf_name = data; @@ -102,7 +102,7 @@ static struct ast_channel *announce_request(const char *type, struct ast_format_ ao2_ref(pvt->bridge, +1); chan = ast_unreal_new_channels(&pvt->base, conf_announce_get_tech(), - AST_STATE_UP, AST_STATE_UP, NULL, NULL, requestor, NULL); + AST_STATE_UP, AST_STATE_UP, NULL, NULL, assignedids, requestor, NULL); if (chan) { ast_answer(pvt->base.owner); ast_answer(pvt->base.chan); diff --git a/apps/confbridge/conf_chan_record.c b/apps/confbridge/conf_chan_record.c index 78d1f272c..34de5af3b 100644 --- a/apps/confbridge/conf_chan_record.c +++ b/apps/confbridge/conf_chan_record.c @@ -53,13 +53,13 @@ static int rec_write(struct ast_channel *ast, struct ast_frame *f) return 0; } -static struct ast_channel *rec_request(const char *type, struct ast_format_cap *cap, const struct ast_channel *requestor, const char *data, int *cause) +static struct ast_channel *rec_request(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *data, int *cause) { struct ast_channel *chan; struct ast_format format; const char *conf_name = data; - chan = ast_channel_alloc(1, AST_STATE_UP, NULL, NULL, NULL, NULL, NULL, NULL, 0, + chan = ast_channel_alloc(1, AST_STATE_UP, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, "CBRec/conf-%s-uid-%d", conf_name, (int) ast_random()); if (!chan) { |