diff options
author | Joshua Colp <jcolp@digium.com> | 2013-10-19 14:45:14 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2013-10-19 14:45:14 +0000 |
commit | d183c6e1346692bfd522bb8e2ab0f8599981189b (patch) | |
tree | 5b0546bd1d0e62fd412448c3ba1b20eed86a6b1d /res/ari/resource_channels.c | |
parent | a80a6a763166b5dbb69dedf042984ff5fda11673 (diff) |
Return a channel snapshot when originating using ARI, and subscribe the Stasis application to it.
This change allows a user of ARI to know what channel it has originated and also follow any
progress. If a Stasis application is provided it will be automatically subscribed to the
originated channel immediately.
(closes issue ASTERISK-22485)
Reported by: David Lee
Review: https://reviewboard.asterisk.org/r/2910/
........
Merged revisions 401281 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401282 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/ari/resource_channels.c')
-rw-r--r-- | res/ari/resource_channels.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/res/ari/resource_channels.c b/res/ari/resource_channels.c index aaf04a3f8..bdca21cdb 100644 --- a/res/ari/resource_channels.c +++ b/res/ari/resource_channels.c @@ -585,6 +585,8 @@ void ast_ari_originate(struct ast_variable *headers, int timeout = 30000; char *stuff; + struct ast_channel *chan; + RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup); if (ast_strlen_zero(args->endpoint)) { ast_ari_response_error(response, 400, "Bad Request", @@ -635,13 +637,13 @@ void ast_ari_originate(struct ast_variable *headers, } /* originate a channel, putting it into an application */ - if (ast_pbx_outgoing_app(dialtech, NULL, dialdevice, timeout, app, ast_str_buffer(appdata), NULL, 0, cid_num, cid_name, NULL, NULL, NULL)) { + if (ast_pbx_outgoing_app(dialtech, NULL, dialdevice, timeout, app, ast_str_buffer(appdata), NULL, 0, cid_num, cid_name, NULL, NULL, &chan)) { ast_ari_response_alloc_failed(response); return; } } else if (!ast_strlen_zero(args->extension)) { /* originate a channel, sending it to an extension */ - if (ast_pbx_outgoing_exten(dialtech, NULL, dialdevice, timeout, S_OR(args->context, "default"), args->extension, args->priority ? args->priority : 1, NULL, 0, cid_num, cid_name, NULL, NULL, NULL, 0)) { + if (ast_pbx_outgoing_exten(dialtech, NULL, dialdevice, timeout, S_OR(args->context, "default"), args->extension, args->priority ? args->priority : 1, NULL, 0, cid_num, cid_name, NULL, NULL, &chan, 0)) { ast_ari_response_alloc_failed(response); return; } @@ -651,7 +653,20 @@ void ast_ari_originate(struct ast_variable *headers, return; } - ast_ari_response_no_content(response); + if (!ast_strlen_zero(args->app)) { + /* channel: + channel ID + null terminator */ + char uri[9 + strlen(ast_channel_uniqueid(chan))]; + const char *uris[1] = { uri, }; + + sprintf(uri, "channel:%s", ast_channel_uniqueid(chan)); + stasis_app_subscribe(args->app, uris, 1, NULL); + } + + snapshot = ast_channel_snapshot_create(chan); + ast_ari_response_ok(response, ast_channel_snapshot_to_json(snapshot)); + + ast_channel_unlock(chan); + ast_channel_unref(chan); } void ast_ari_get_channel_var(struct ast_variable *headers, struct ast_get_channel_var_args *args, struct ast_ari_response *response) |