2013-07-03 17:58:45 +00:00
|
|
|
/*
|
2013-04-22 14:58:53 +00:00
|
|
|
* Asterisk -- An open source telephony toolkit.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2012 - 2013, Digium, Inc.
|
|
|
|
*
|
|
|
|
* David M. Lee, II <dlee@digium.com>
|
|
|
|
*
|
|
|
|
* See http://www.asterisk.org for more information about
|
|
|
|
* the Asterisk project. Please do not directly contact
|
|
|
|
* any of the maintainers of this project for assistance;
|
|
|
|
* the project provides a web site, mailing lists and IRC
|
|
|
|
* channels for your use.
|
|
|
|
*
|
|
|
|
* This program is free software, distributed under the terms of
|
|
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
|
|
* at the top of the source tree.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*! \file
|
|
|
|
*
|
2013-07-27 23:11:02 +00:00
|
|
|
* \brief Implementation for ARI stubs.
|
2013-04-22 14:58:53 +00:00
|
|
|
*
|
|
|
|
* \author David M. Lee, II <dlee@digium.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*** MODULEINFO
|
2013-05-23 20:11:35 +00:00
|
|
|
<depend type="module">res_stasis_app_playback</depend>
|
2013-04-22 14:58:53 +00:00
|
|
|
<support_level>core</support_level>
|
|
|
|
***/
|
|
|
|
|
|
|
|
#include "asterisk.h"
|
|
|
|
|
|
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|
|
|
|
2013-05-23 20:11:35 +00:00
|
|
|
#include "asterisk/file.h"
|
2013-06-07 18:39:42 +00:00
|
|
|
#include "asterisk/pbx.h"
|
2013-07-25 04:06:32 +00:00
|
|
|
#include "asterisk/bridge.h"
|
2013-06-07 18:39:42 +00:00
|
|
|
#include "asterisk/callerid.h"
|
2013-04-22 14:58:53 +00:00
|
|
|
#include "asterisk/stasis_app.h"
|
2013-05-23 20:11:35 +00:00
|
|
|
#include "asterisk/stasis_app_playback.h"
|
2013-07-03 17:58:45 +00:00
|
|
|
#include "asterisk/stasis_app_recording.h"
|
2013-11-23 12:40:46 +00:00
|
|
|
#include "asterisk/stasis_app_snoop.h"
|
2013-04-22 14:58:53 +00:00
|
|
|
#include "asterisk/stasis_channels.h"
|
2013-11-01 14:38:21 +00:00
|
|
|
#include "asterisk/causes.h"
|
2013-04-22 14:58:53 +00:00
|
|
|
#include "resource_channels.h"
|
|
|
|
|
2013-05-23 20:11:35 +00:00
|
|
|
#include <limits.h>
|
|
|
|
|
2013-04-22 14:58:53 +00:00
|
|
|
/*!
|
|
|
|
* \brief Finds the control object for a channel, filling the response with an
|
|
|
|
* error, if appropriate.
|
|
|
|
* \param[out] response Response to fill with an error if control is not found.
|
|
|
|
* \param channel_id ID of the channel to lookup.
|
|
|
|
* \return Channel control object.
|
|
|
|
* \return \c NULL if control object does not exist.
|
|
|
|
*/
|
|
|
|
static struct stasis_app_control *find_control(
|
2013-07-27 23:11:02 +00:00
|
|
|
struct ast_ari_response *response,
|
2013-04-22 14:58:53 +00:00
|
|
|
const char *channel_id)
|
|
|
|
{
|
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
|
|
|
|
ast_assert(response != NULL);
|
|
|
|
|
|
|
|
control = stasis_app_control_find_by_channel_id(channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
/* Distinguish between 404 and 409 errors */
|
|
|
|
RAII_VAR(struct ast_channel *, chan, NULL, ao2_cleanup);
|
|
|
|
chan = ast_channel_get_by_name(channel_id);
|
|
|
|
if (chan == NULL) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(response, 404, "Not Found",
|
2013-04-22 14:58:53 +00:00
|
|
|
"Channel not found");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(response, 409, "Conflict",
|
2013-04-22 14:58:53 +00:00
|
|
|
"Channel not in Stasis application");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ao2_ref(control, +1);
|
|
|
|
return control;
|
|
|
|
}
|
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_continue_in_dialplan(
|
2013-04-22 14:58:53 +00:00
|
|
|
struct ast_variable *headers,
|
2013-11-07 21:10:31 +00:00
|
|
|
struct ast_ari_channels_continue_in_dialplan_args *args,
|
2013-07-27 23:11:02 +00:00
|
|
|
struct ast_ari_response *response)
|
2013-04-22 14:58:53 +00:00
|
|
|
{
|
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
|
|
|
|
ast_assert(response != NULL);
|
|
|
|
|
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-06-26 19:29:57 +00:00
|
|
|
if (stasis_app_control_continue(control, args->context, args->extension, args->priority)) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_alloc_failed(response);
|
2013-06-26 19:29:57 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_no_content(response);
|
2013-04-22 14:58:53 +00:00
|
|
|
}
|
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_answer(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_answer_args *args,
|
|
|
|
struct ast_ari_response *response)
|
2013-04-22 14:58:53 +00:00
|
|
|
{
|
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
|
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (stasis_app_control_answer(control) != 0) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-04-22 14:58:53 +00:00
|
|
|
response, 500, "Internal Server Error",
|
|
|
|
"Failed to answer channel");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_no_content(response);
|
2013-04-22 14:58:53 +00:00
|
|
|
}
|
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_ring(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_ring_args *args,
|
|
|
|
struct ast_ari_response *response)
|
2013-11-01 14:38:21 +00:00
|
|
|
{
|
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
|
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
stasis_app_control_ring(control);
|
|
|
|
|
2013-11-13 23:11:32 +00:00
|
|
|
ast_ari_response_no_content(response);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ast_ari_channels_ring_stop(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_ring_stop_args *args,
|
|
|
|
struct ast_ari_response *response)
|
|
|
|
{
|
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
|
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
stasis_app_control_ring_stop(control);
|
|
|
|
|
2013-11-01 14:38:21 +00:00
|
|
|
ast_ari_response_no_content(response);
|
|
|
|
}
|
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_mute(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_mute_args *args,
|
|
|
|
struct ast_ari_response *response)
|
2013-04-22 14:58:53 +00:00
|
|
|
{
|
2013-07-18 16:03:12 +00:00
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
unsigned int direction = 0;
|
|
|
|
enum ast_frame_type frametype = AST_FRAME_VOICE;
|
|
|
|
|
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-10-03 19:06:48 +00:00
|
|
|
if (ast_strlen_zero(args->direction)) {
|
|
|
|
ast_ari_response_error(
|
|
|
|
response, 400, "Bad Request",
|
|
|
|
"Direction is required");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-07-18 16:03:12 +00:00
|
|
|
if (!strcmp(args->direction, "in")) {
|
|
|
|
direction = AST_MUTE_DIRECTION_READ;
|
|
|
|
} else if (!strcmp(args->direction, "out")) {
|
|
|
|
direction = AST_MUTE_DIRECTION_WRITE;
|
|
|
|
} else if (!strcmp(args->direction, "both")) {
|
|
|
|
direction = AST_MUTE_DIRECTION_READ | AST_MUTE_DIRECTION_WRITE;
|
|
|
|
} else {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-18 16:03:12 +00:00
|
|
|
response, 400, "Bad Request",
|
|
|
|
"Invalid direction specified");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
stasis_app_control_mute(control, direction, frametype);
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_no_content(response);
|
2013-04-22 14:58:53 +00:00
|
|
|
}
|
2013-07-18 16:03:12 +00:00
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_unmute(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_unmute_args *args,
|
|
|
|
struct ast_ari_response *response)
|
2013-04-22 14:58:53 +00:00
|
|
|
{
|
2013-07-18 16:03:12 +00:00
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
unsigned int direction = 0;
|
|
|
|
enum ast_frame_type frametype = AST_FRAME_VOICE;
|
|
|
|
|
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-10-03 19:06:48 +00:00
|
|
|
if (ast_strlen_zero(args->direction)) {
|
|
|
|
ast_ari_response_error(
|
|
|
|
response, 400, "Bad Request",
|
|
|
|
"Direction is required");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-07-18 16:03:12 +00:00
|
|
|
if (!strcmp(args->direction, "in")) {
|
|
|
|
direction = AST_MUTE_DIRECTION_READ;
|
|
|
|
} else if (!strcmp(args->direction, "out")) {
|
|
|
|
direction = AST_MUTE_DIRECTION_WRITE;
|
|
|
|
} else if (!strcmp(args->direction, "both")) {
|
|
|
|
direction = AST_MUTE_DIRECTION_READ | AST_MUTE_DIRECTION_WRITE;
|
|
|
|
} else {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-18 16:03:12 +00:00
|
|
|
response, 400, "Bad Request",
|
|
|
|
"Invalid direction specified");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
stasis_app_control_unmute(control, direction, frametype);
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_no_content(response);
|
2013-04-22 14:58:53 +00:00
|
|
|
}
|
2013-07-18 16:03:12 +00:00
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_send_dtmf(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_send_dtmf_args *args,
|
|
|
|
struct ast_ari_response *response)
|
2013-11-01 14:38:21 +00:00
|
|
|
{
|
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
|
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ast_strlen_zero(args->dtmf)) {
|
|
|
|
ast_ari_response_error(
|
|
|
|
response, 400, "Bad Request",
|
|
|
|
"DTMF is required");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
stasis_app_control_dtmf(control, args->dtmf, args->before, args->between, args->duration, args->after);
|
|
|
|
|
|
|
|
ast_ari_response_no_content(response);
|
|
|
|
}
|
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_hold(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_hold_args *args,
|
|
|
|
struct ast_ari_response *response)
|
2013-04-22 14:58:53 +00:00
|
|
|
{
|
2013-07-01 18:56:21 +00:00
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
|
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
/* Response filled in by find_control */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
stasis_app_control_hold(control);
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_no_content(response);
|
2013-04-22 14:58:53 +00:00
|
|
|
}
|
2013-07-01 18:56:21 +00:00
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_unhold(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_unhold_args *args,
|
|
|
|
struct ast_ari_response *response)
|
2013-04-22 14:58:53 +00:00
|
|
|
{
|
2013-07-01 18:56:21 +00:00
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
|
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
/* Response filled in by find_control */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
stasis_app_control_unhold(control);
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_no_content(response);
|
2013-04-22 14:58:53 +00:00
|
|
|
}
|
2013-05-23 20:11:35 +00:00
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_start_moh(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_start_moh_args *args,
|
|
|
|
struct ast_ari_response *response)
|
2013-07-19 19:40:27 +00:00
|
|
|
{
|
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
|
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
/* Response filled in by find_control */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
stasis_app_control_moh_start(control, args->moh_class);
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_no_content(response);
|
2013-07-19 19:40:27 +00:00
|
|
|
}
|
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_stop_moh(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_stop_moh_args *args,
|
|
|
|
struct ast_ari_response *response)
|
2013-07-19 19:40:27 +00:00
|
|
|
{
|
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
|
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
/* Response filled in by find_control */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
stasis_app_control_moh_stop(control);
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_no_content(response);
|
2013-07-19 19:40:27 +00:00
|
|
|
}
|
|
|
|
|
2013-11-21 15:56:34 +00:00
|
|
|
void ast_ari_channels_start_silence(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_start_silence_args *args,
|
|
|
|
struct ast_ari_response *response)
|
|
|
|
{
|
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
|
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
/* Response filled in by find_control */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
stasis_app_control_silence_start(control);
|
|
|
|
ast_ari_response_no_content(response);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ast_ari_channels_stop_silence(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_stop_silence_args *args,
|
|
|
|
struct ast_ari_response *response)
|
|
|
|
{
|
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
|
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
/* Response filled in by find_control */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
stasis_app_control_silence_stop(control);
|
|
|
|
ast_ari_response_no_content(response);
|
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
static void ari_channels_handle_play(
|
|
|
|
const char *args_channel_id,
|
|
|
|
const char *args_media,
|
|
|
|
const char *args_lang,
|
|
|
|
int args_offsetms,
|
|
|
|
int args_skipms,
|
|
|
|
const char *args_playback_id,
|
2013-07-27 23:11:02 +00:00
|
|
|
struct ast_ari_response *response)
|
2013-04-22 14:58:53 +00:00
|
|
|
{
|
2013-05-23 20:11:35 +00:00
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);
|
|
|
|
RAII_VAR(struct stasis_app_playback *, playback, NULL, ao2_cleanup);
|
|
|
|
RAII_VAR(char *, playback_url, NULL, ast_free);
|
2014-01-12 22:24:27 +00:00
|
|
|
struct ast_json *json;
|
2013-05-23 20:11:35 +00:00
|
|
|
const char *language;
|
|
|
|
|
|
|
|
ast_assert(response != NULL);
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
control = find_control(response, args_channel_id);
|
2013-05-23 20:11:35 +00:00
|
|
|
if (control == NULL) {
|
|
|
|
/* Response filled in by find_control */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
snapshot = stasis_app_control_get_snapshot(control);
|
|
|
|
if (!snapshot) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-05-23 20:11:35 +00:00
|
|
|
response, 404, "Not Found",
|
|
|
|
"Channel not found");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
if (args_skipms < 0) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-06-28 15:36:49 +00:00
|
|
|
response, 400, "Bad Request",
|
2013-05-23 20:21:16 +00:00
|
|
|
"skipms cannot be negative");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
if (args_offsetms < 0) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-06-28 15:36:49 +00:00
|
|
|
response, 400, "Bad Request",
|
2013-05-23 20:21:16 +00:00
|
|
|
"offsetms cannot be negative");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
language = S_OR(args_lang, snapshot->language);
|
2013-05-23 20:11:35 +00:00
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
playback = stasis_app_control_play_uri(control, args_media, language,
|
|
|
|
args_channel_id, STASIS_PLAYBACK_TARGET_CHANNEL, args_skipms, args_offsetms, args_playback_id);
|
2013-05-23 20:11:35 +00:00
|
|
|
if (!playback) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-05-23 20:11:35 +00:00
|
|
|
response, 500, "Internal Server Error",
|
2013-05-23 20:21:16 +00:00
|
|
|
"Failed to queue media for playback");
|
2013-05-23 20:11:35 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
ast_asprintf(&playback_url, "/playback/%s",
|
|
|
|
stasis_app_playback_get_id(playback));
|
|
|
|
if (!playback_url) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-05-23 20:11:35 +00:00
|
|
|
response, 500, "Internal Server Error",
|
|
|
|
"Out of memory");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-05-23 21:46:38 +00:00
|
|
|
json = stasis_app_playback_to_json(playback);
|
|
|
|
if (!json) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-05-23 21:46:38 +00:00
|
|
|
response, 500, "Internal Server Error",
|
|
|
|
"Out of memory");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_created(response, playback_url, json);
|
2013-04-22 14:58:53 +00:00
|
|
|
}
|
2013-07-03 17:58:45 +00:00
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
void ast_ari_channels_play(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_play_args *args,
|
|
|
|
struct ast_ari_response *response)
|
|
|
|
{
|
|
|
|
ari_channels_handle_play(
|
|
|
|
args->channel_id,
|
|
|
|
args->media,
|
|
|
|
args->lang,
|
|
|
|
args->offsetms,
|
|
|
|
args->skipms,
|
|
|
|
args->playback_id,
|
|
|
|
response);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ast_ari_channels_play_with_id(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_play_with_id_args *args,
|
|
|
|
struct ast_ari_response *response)
|
|
|
|
{
|
|
|
|
ari_channels_handle_play(
|
|
|
|
args->channel_id,
|
|
|
|
args->media,
|
|
|
|
args->lang,
|
|
|
|
args->offsetms,
|
|
|
|
args->skipms,
|
|
|
|
args->playback_id,
|
|
|
|
response);
|
|
|
|
}
|
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_record(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_record_args *args,
|
2013-07-27 23:11:02 +00:00
|
|
|
struct ast_ari_response *response)
|
2013-04-22 14:58:53 +00:00
|
|
|
{
|
2013-07-03 17:58:45 +00:00
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
RAII_VAR(struct stasis_app_recording *, recording, NULL, ao2_cleanup);
|
|
|
|
RAII_VAR(char *, recording_url, NULL, ast_free);
|
2014-01-12 22:24:27 +00:00
|
|
|
struct ast_json *json;
|
2013-07-03 17:58:45 +00:00
|
|
|
RAII_VAR(struct stasis_app_recording_options *, options, NULL,
|
|
|
|
ao2_cleanup);
|
|
|
|
RAII_VAR(char *, uri_encoded_name, NULL, ast_free);
|
|
|
|
size_t uri_name_maxlen;
|
|
|
|
|
|
|
|
ast_assert(response != NULL);
|
|
|
|
|
|
|
|
if (args->max_duration_seconds < 0) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-03 17:58:45 +00:00
|
|
|
response, 400, "Bad Request",
|
|
|
|
"max_duration_seconds cannot be negative");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (args->max_silence_seconds < 0) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-03 17:58:45 +00:00
|
|
|
response, 400, "Bad Request",
|
|
|
|
"max_silence_seconds cannot be negative");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
/* Response filled in by find_control */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
options = stasis_app_recording_options_create(args->name, args->format);
|
|
|
|
if (options == NULL) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-03 17:58:45 +00:00
|
|
|
response, 500, "Internal Server Error",
|
|
|
|
"Out of memory");
|
|
|
|
}
|
2014-03-06 18:20:37 +00:00
|
|
|
ast_string_field_build(options, target, "channel:%s", args->channel_id);
|
2013-07-03 17:58:45 +00:00
|
|
|
options->max_silence_seconds = args->max_silence_seconds;
|
|
|
|
options->max_duration_seconds = args->max_duration_seconds;
|
|
|
|
options->terminate_on =
|
|
|
|
stasis_app_recording_termination_parse(args->terminate_on);
|
|
|
|
options->if_exists =
|
|
|
|
stasis_app_recording_if_exists_parse(args->if_exists);
|
|
|
|
options->beep = args->beep;
|
|
|
|
|
|
|
|
if (options->terminate_on == STASIS_APP_RECORDING_TERMINATE_INVALID) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-03 17:58:45 +00:00
|
|
|
response, 400, "Bad Request",
|
|
|
|
"terminateOn invalid");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (options->if_exists == -1) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-03 17:58:45 +00:00
|
|
|
response, 400, "Bad Request",
|
|
|
|
"ifExists invalid");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-10-25 22:01:43 +00:00
|
|
|
if (!ast_get_format_for_file_ext(options->format)) {
|
|
|
|
ast_ari_response_error(
|
|
|
|
response, 422, "Unprocessable Entity",
|
|
|
|
"specified format is unknown on this system");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-07-03 17:58:45 +00:00
|
|
|
recording = stasis_app_control_record(control, options);
|
|
|
|
if (recording == NULL) {
|
|
|
|
switch(errno) {
|
|
|
|
case EINVAL:
|
|
|
|
/* While the arguments are invalid, we should have
|
|
|
|
* caught them prior to calling record.
|
|
|
|
*/
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-03 17:58:45 +00:00
|
|
|
response, 500, "Internal Server Error",
|
|
|
|
"Error parsing request");
|
|
|
|
break;
|
|
|
|
case EEXIST:
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(response, 409, "Conflict",
|
2013-10-25 21:28:32 +00:00
|
|
|
"Recording '%s' already exists and can not be overwritten",
|
2013-07-03 17:58:45 +00:00
|
|
|
args->name);
|
|
|
|
break;
|
|
|
|
case ENOMEM:
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-03 17:58:45 +00:00
|
|
|
response, 500, "Internal Server Error",
|
|
|
|
"Out of memory");
|
|
|
|
break;
|
|
|
|
case EPERM:
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-03 17:58:45 +00:00
|
|
|
response, 400, "Bad Request",
|
|
|
|
"Recording name invalid");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ast_log(LOG_WARNING,
|
|
|
|
"Unrecognized recording error: %s\n",
|
|
|
|
strerror(errno));
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-03 17:58:45 +00:00
|
|
|
response, 500, "Internal Server Error",
|
|
|
|
"Internal Server Error");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
uri_name_maxlen = strlen(args->name) * 3;
|
|
|
|
uri_encoded_name = ast_malloc(uri_name_maxlen);
|
|
|
|
if (!uri_encoded_name) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-03 17:58:45 +00:00
|
|
|
response, 500, "Internal Server Error",
|
|
|
|
"Out of memory");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
ast_uri_encode(args->name, uri_encoded_name, uri_name_maxlen,
|
|
|
|
ast_uri_http);
|
|
|
|
|
|
|
|
ast_asprintf(&recording_url, "/recordings/live/%s", uri_encoded_name);
|
|
|
|
if (!recording_url) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-03 17:58:45 +00:00
|
|
|
response, 500, "Internal Server Error",
|
|
|
|
"Out of memory");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
json = stasis_app_recording_to_json(recording);
|
|
|
|
if (!json) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-03 17:58:45 +00:00
|
|
|
response, 500, "Internal Server Error",
|
|
|
|
"Out of memory");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_created(response, recording_url, json);
|
2013-04-22 14:58:53 +00:00
|
|
|
}
|
2013-07-03 17:58:45 +00:00
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_get(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_get_args *args,
|
|
|
|
struct ast_ari_response *response)
|
2013-04-22 14:58:53 +00:00
|
|
|
{
|
|
|
|
RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup);
|
2013-08-01 13:49:34 +00:00
|
|
|
struct stasis_cache *cache;
|
2013-04-22 14:58:53 +00:00
|
|
|
struct ast_channel_snapshot *snapshot;
|
|
|
|
|
2013-08-01 13:49:34 +00:00
|
|
|
cache = ast_channel_cache();
|
|
|
|
if (!cache) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-04-22 14:58:53 +00:00
|
|
|
response, 500, "Internal Server Error",
|
|
|
|
"Message bus not initialized");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-08-01 13:49:34 +00:00
|
|
|
msg = stasis_cache_get(cache, ast_channel_snapshot_type(),
|
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
2014-03-07 15:47:55 +00:00
|
|
|
args->channel_id);
|
2013-04-22 14:58:53 +00:00
|
|
|
if (!msg) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-04-22 14:58:53 +00:00
|
|
|
response, 404, "Not Found",
|
|
|
|
"Channel not found");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
snapshot = stasis_message_data(msg);
|
|
|
|
ast_assert(snapshot != NULL);
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_ok(response,
|
2013-11-22 20:10:46 +00:00
|
|
|
ast_channel_snapshot_to_json(snapshot, NULL));
|
2013-04-22 14:58:53 +00:00
|
|
|
}
|
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_hangup(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_hangup_args *args,
|
|
|
|
struct ast_ari_response *response)
|
2013-04-22 14:58:53 +00:00
|
|
|
{
|
|
|
|
RAII_VAR(struct ast_channel *, chan, NULL, ao2_cleanup);
|
2013-11-01 14:38:21 +00:00
|
|
|
int cause;
|
2013-04-22 14:58:53 +00:00
|
|
|
|
|
|
|
chan = ast_channel_get_by_name(args->channel_id);
|
|
|
|
if (chan == NULL) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-04-22 14:58:53 +00:00
|
|
|
response, 404, "Not Found",
|
|
|
|
"Channel not found");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-11-01 14:38:21 +00:00
|
|
|
if (ast_strlen_zero(args->reason) || !strcmp(args->reason, "normal")) {
|
|
|
|
cause = AST_CAUSE_NORMAL;
|
|
|
|
} else if (!strcmp(args->reason, "busy")) {
|
|
|
|
cause = AST_CAUSE_BUSY;
|
|
|
|
} else if (!strcmp(args->reason, "congestion")) {
|
|
|
|
cause = AST_CAUSE_CONGESTION;
|
|
|
|
} else {
|
|
|
|
ast_ari_response_error(
|
|
|
|
response, 400, "Invalid Reason",
|
|
|
|
"Invalid reason for hangup provided");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
ast_channel_hangupcause_set(chan, cause);
|
2013-04-22 14:58:53 +00:00
|
|
|
ast_softhangup(chan, AST_SOFTHANGUP_EXPLICIT);
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_no_content(response);
|
2013-04-22 14:58:53 +00:00
|
|
|
}
|
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_list(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_list_args *args,
|
|
|
|
struct ast_ari_response *response)
|
2013-04-22 14:58:53 +00:00
|
|
|
{
|
2013-08-01 13:49:34 +00:00
|
|
|
RAII_VAR(struct stasis_cache *, cache, NULL, ao2_cleanup);
|
2013-04-22 14:58:53 +00:00
|
|
|
RAII_VAR(struct ao2_container *, snapshots, NULL, ao2_cleanup);
|
|
|
|
RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
|
|
|
|
struct ao2_iterator i;
|
|
|
|
void *obj;
|
2013-11-22 20:10:46 +00:00
|
|
|
struct stasis_message_sanitizer *sanitize = stasis_app_get_sanitizer();
|
2013-04-22 14:58:53 +00:00
|
|
|
|
2013-08-01 13:49:34 +00:00
|
|
|
cache = ast_channel_cache();
|
|
|
|
if (!cache) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-04-22 14:58:53 +00:00
|
|
|
response, 500, "Internal Server Error",
|
|
|
|
"Message bus not initialized");
|
|
|
|
return;
|
|
|
|
}
|
2013-08-01 13:49:34 +00:00
|
|
|
ao2_ref(cache, +1);
|
2013-04-22 14:58:53 +00:00
|
|
|
|
2013-08-01 13:49:34 +00:00
|
|
|
snapshots = stasis_cache_dump(cache, ast_channel_snapshot_type());
|
2013-04-22 14:58:53 +00:00
|
|
|
if (!snapshots) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_alloc_failed(response);
|
2013-04-22 14:58:53 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
json = ast_json_array_create();
|
|
|
|
if (!json) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_alloc_failed(response);
|
2013-04-22 14:58:53 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-12-20 20:00:50 +00:00
|
|
|
i = ao2_iterator_init(snapshots, 0);
|
|
|
|
while ((obj = ao2_iterator_next(&i))) {
|
2013-04-22 14:58:53 +00:00
|
|
|
RAII_VAR(struct stasis_message *, msg, obj, ao2_cleanup);
|
|
|
|
struct ast_channel_snapshot *snapshot = stasis_message_data(msg);
|
2013-11-22 20:10:46 +00:00
|
|
|
int r;
|
|
|
|
|
|
|
|
if (sanitize && sanitize->channel_snapshot
|
|
|
|
&& sanitize->channel_snapshot(snapshot)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
r = ast_json_array_append(
|
|
|
|
json, ast_channel_snapshot_to_json(snapshot, NULL));
|
2013-04-22 14:58:53 +00:00
|
|
|
if (r != 0) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_alloc_failed(response);
|
2013-11-22 20:10:46 +00:00
|
|
|
ao2_iterator_destroy(&i);
|
2013-04-22 14:58:53 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ao2_iterator_destroy(&i);
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_ok(response, ast_json_ref(json));
|
2013-04-22 14:58:53 +00:00
|
|
|
}
|
|
|
|
|
2014-02-11 03:18:25 +00:00
|
|
|
static int json_to_ast_variables(struct ast_json *json_variables, struct ast_variable **variables)
|
2014-01-21 14:27:21 +00:00
|
|
|
{
|
2014-02-11 03:18:25 +00:00
|
|
|
struct ast_variable *current = NULL;
|
|
|
|
struct ast_json_iter *it_json_var;
|
|
|
|
|
|
|
|
for (it_json_var = ast_json_object_iter(json_variables); it_json_var;
|
|
|
|
it_json_var = ast_json_object_iter_next(json_variables, it_json_var)) {
|
|
|
|
struct ast_variable *new_var;
|
|
|
|
|
|
|
|
new_var = ast_variable_new(ast_json_object_iter_key(it_json_var),
|
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
2014-03-07 15:47:55 +00:00
|
|
|
ast_json_string_get(ast_json_object_iter_value(it_json_var)),
|
|
|
|
"");
|
2014-02-11 03:18:25 +00:00
|
|
|
if (!new_var) {
|
|
|
|
ast_variables_destroy(*variables);
|
|
|
|
*variables = NULL;
|
|
|
|
return 1;
|
|
|
|
}
|
2014-01-21 14:27:21 +00:00
|
|
|
|
2014-02-11 03:18:25 +00:00
|
|
|
if (!current) {
|
|
|
|
*variables = new_var;
|
|
|
|
current = *variables;
|
|
|
|
} else {
|
|
|
|
current->next = new_var;
|
|
|
|
current = new_var;
|
2014-01-21 14:27:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
static void ari_channels_handle_originate_with_id(const char *args_endpoint,
|
|
|
|
const char *args_extension,
|
|
|
|
const char *args_context,
|
|
|
|
long args_priority,
|
|
|
|
const char *args_app,
|
|
|
|
const char *args_app_args,
|
|
|
|
const char *args_caller_id,
|
|
|
|
int args_timeout,
|
|
|
|
struct ast_variable *variables,
|
|
|
|
const char *args_channel_id,
|
|
|
|
const char *args_other_channel_id,
|
2013-11-07 21:10:31 +00:00
|
|
|
struct ast_ari_response *response)
|
2013-04-22 14:58:53 +00:00
|
|
|
{
|
2013-06-28 16:23:24 +00:00
|
|
|
char *dialtech;
|
2013-06-07 18:39:42 +00:00
|
|
|
char dialdevice[AST_CHANNEL_NAME];
|
|
|
|
char *caller_id = NULL;
|
|
|
|
char *cid_num = NULL;
|
|
|
|
char *cid_name = NULL;
|
|
|
|
int timeout = 30000;
|
2013-12-17 12:59:49 +00:00
|
|
|
RAII_VAR(struct ast_format_cap *, cap,
|
|
|
|
ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_NOLOCK), ast_format_cap_destroy);
|
|
|
|
struct ast_format tmp_fmt;
|
2013-06-28 16:23:24 +00:00
|
|
|
char *stuff;
|
2013-10-19 14:45:14 +00:00
|
|
|
struct ast_channel *chan;
|
|
|
|
RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);
|
2014-03-20 16:35:57 +00:00
|
|
|
struct ast_assigned_ids assignedids = {
|
|
|
|
.uniqueid = args_channel_id,
|
|
|
|
.uniqueid2 = args_other_channel_id,
|
|
|
|
};
|
2013-06-07 18:39:42 +00:00
|
|
|
|
2013-12-17 12:59:49 +00:00
|
|
|
if (!cap) {
|
|
|
|
ast_ari_response_alloc_failed(response);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
ast_format_cap_add(cap, ast_format_set(&tmp_fmt, AST_FORMAT_SLINEAR, 0));
|
|
|
|
|
2014-03-20 16:35:57 +00:00
|
|
|
if ((assignedids.uniqueid && AST_MAX_PUBLIC_UNIQUEID < strlen(assignedids.uniqueid))
|
|
|
|
|| (assignedids.uniqueid2 && AST_MAX_PUBLIC_UNIQUEID < strlen(assignedids.uniqueid2))) {
|
|
|
|
ast_ari_response_error(response, 400, "Bad Request",
|
|
|
|
"Uniqueid length exceeds maximum of %d\n", AST_MAX_PUBLIC_UNIQUEID);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
if (ast_strlen_zero(args_endpoint)) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(response, 400, "Bad Request",
|
2013-06-28 16:23:24 +00:00
|
|
|
"Endpoint must be specified");
|
2013-06-07 18:39:42 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
dialtech = ast_strdupa(args_endpoint);
|
2013-06-28 16:23:24 +00:00
|
|
|
if ((stuff = strchr(dialtech, '/'))) {
|
|
|
|
*stuff++ = '\0';
|
|
|
|
ast_copy_string(dialdevice, stuff, sizeof(dialdevice));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ast_strlen_zero(dialtech) || ast_strlen_zero(dialdevice)) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(response, 400, "Bad Request",
|
2013-06-28 16:23:24 +00:00
|
|
|
"Invalid endpoint specified");
|
|
|
|
return;
|
2013-06-07 18:39:42 +00:00
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
if (args_timeout > 0) {
|
|
|
|
timeout = args_timeout * 1000;
|
|
|
|
} else if (args_timeout == -1) {
|
2013-06-07 18:39:42 +00:00
|
|
|
timeout = -1;
|
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
if (!ast_strlen_zero(args_caller_id)) {
|
|
|
|
caller_id = ast_strdupa(args_caller_id);
|
2013-06-07 18:39:42 +00:00
|
|
|
ast_callerid_parse(caller_id, &cid_name, &cid_num);
|
|
|
|
|
|
|
|
if (ast_is_shrinkable_phonenumber(cid_num)) {
|
|
|
|
ast_shrink_phone_number(cid_num);
|
|
|
|
}
|
2013-04-22 14:58:53 +00:00
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
if (!ast_strlen_zero(args_app)) {
|
2013-06-28 16:23:24 +00:00
|
|
|
const char *app = "Stasis";
|
2013-06-07 18:39:42 +00:00
|
|
|
|
2013-06-28 16:23:24 +00:00
|
|
|
RAII_VAR(struct ast_str *, appdata, ast_str_create(64), ast_free);
|
|
|
|
|
|
|
|
if (!appdata) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_alloc_failed(response);
|
2013-06-28 16:23:24 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
ast_str_set(&appdata, 0, "%s", args_app);
|
|
|
|
if (!ast_strlen_zero(args_app_args)) {
|
|
|
|
ast_str_append(&appdata, 0, ",%s", args_app_args);
|
2013-06-28 16:23:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* originate a channel, putting it into an application */
|
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
2014-03-07 15:47:55 +00:00
|
|
|
if (ast_pbx_outgoing_app(dialtech, cap, dialdevice, timeout, app, ast_str_buffer(appdata), NULL, 0, cid_num, cid_name, variables, NULL, &chan, &assignedids)) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_alloc_failed(response);
|
2013-06-28 16:23:24 +00:00
|
|
|
return;
|
|
|
|
}
|
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
2014-03-07 15:47:55 +00:00
|
|
|
} else if (!ast_strlen_zero(args_extension)) {
|
2013-06-28 16:23:24 +00:00
|
|
|
/* originate a channel, sending it to an extension */
|
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
2014-03-07 15:47:55 +00:00
|
|
|
if (ast_pbx_outgoing_exten(dialtech, cap, dialdevice, timeout, S_OR(args_context, "default"), args_extension, args_priority ? args_priority : 1, NULL, 0, cid_num, cid_name, variables, NULL, &chan, 0, &assignedids)) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_alloc_failed(response);
|
2013-06-28 16:23:24 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
} else {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(response, 400, "Bad Request",
|
2013-06-28 16:23:24 +00:00
|
|
|
"Application or extension must be specified");
|
2013-06-07 18:39:42 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-11-01 12:33:09 +00:00
|
|
|
snapshot = ast_channel_snapshot_create(chan);
|
|
|
|
ast_channel_unlock(chan);
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
if (!ast_strlen_zero(args_app)) {
|
2013-10-19 14:45:14 +00:00
|
|
|
/* 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));
|
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
2014-03-07 15:47:55 +00:00
|
|
|
stasis_app_subscribe(args_app, uris, 1, NULL);
|
2013-10-19 14:45:14 +00:00
|
|
|
}
|
|
|
|
|
2013-11-22 20:10:46 +00:00
|
|
|
ast_ari_response_ok(response, ast_channel_snapshot_to_json(snapshot, NULL));
|
2013-10-19 14:45:14 +00:00
|
|
|
ast_channel_unref(chan);
|
2013-04-22 14:58:53 +00:00
|
|
|
}
|
2013-07-08 14:46:20 +00:00
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
void ast_ari_channels_originate_with_id(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_originate_with_id_args *args,
|
|
|
|
struct ast_ari_response *response)
|
|
|
|
{
|
|
|
|
RAII_VAR(struct ast_variable *, variables, NULL, ast_variables_destroy);
|
|
|
|
|
|
|
|
/* Parse any query parameters out of the body parameter */
|
|
|
|
if (args->variables) {
|
|
|
|
struct ast_json *json_variables;
|
|
|
|
|
|
|
|
ast_ari_channels_originate_with_id_parse_body(args->variables, args);
|
|
|
|
json_variables = ast_json_object_get(args->variables, "variables");
|
|
|
|
if (json_variables) {
|
|
|
|
if (json_to_ast_variables(json_variables, &variables)) {
|
|
|
|
ast_log(AST_LOG_ERROR, "Unable to convert 'variables' in JSON body to channel variables\n");
|
|
|
|
ast_ari_response_alloc_failed(response);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ari_channels_handle_originate_with_id(
|
|
|
|
args->endpoint,
|
|
|
|
args->extension,
|
|
|
|
args->context,
|
|
|
|
args->priority,
|
|
|
|
args->app,
|
|
|
|
args->app_args,
|
|
|
|
args->caller_id,
|
|
|
|
args->timeout,
|
|
|
|
variables,
|
|
|
|
args->channel_id,
|
|
|
|
args->other_channel_id,
|
|
|
|
response);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ast_ari_channels_originate(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_originate_args *args,
|
|
|
|
struct ast_ari_response *response)
|
|
|
|
{
|
|
|
|
RAII_VAR(struct ast_variable *, variables, NULL, ast_variables_destroy);
|
|
|
|
|
|
|
|
/* Parse any query parameters out of the body parameter */
|
|
|
|
if (args->variables) {
|
|
|
|
struct ast_json *json_variables;
|
|
|
|
|
|
|
|
ast_ari_channels_originate_parse_body(args->variables, args);
|
|
|
|
json_variables = ast_json_object_get(args->variables, "variables");
|
|
|
|
if (json_variables) {
|
|
|
|
if (json_to_ast_variables(json_variables, &variables)) {
|
|
|
|
ast_log(AST_LOG_ERROR, "Unable to convert 'variables' in JSON body to channel variables\n");
|
|
|
|
ast_ari_response_alloc_failed(response);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ari_channels_handle_originate_with_id(
|
|
|
|
args->endpoint,
|
|
|
|
args->extension,
|
|
|
|
args->context,
|
|
|
|
args->priority,
|
|
|
|
args->app,
|
|
|
|
args->app_args,
|
|
|
|
args->caller_id,
|
|
|
|
args->timeout,
|
|
|
|
variables,
|
|
|
|
args->channel_id,
|
|
|
|
args->other_channel_id,
|
|
|
|
response);
|
|
|
|
}
|
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_get_channel_var(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_get_channel_var_args *args,
|
|
|
|
struct ast_ari_response *response)
|
2013-07-08 14:46:20 +00:00
|
|
|
{
|
|
|
|
RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
|
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
RAII_VAR(char *, value, NULL, ast_free);
|
|
|
|
|
|
|
|
ast_assert(response != NULL);
|
|
|
|
|
2013-08-21 16:23:59 +00:00
|
|
|
if (ast_strlen_zero(args->variable)) {
|
|
|
|
ast_ari_response_error(
|
|
|
|
response, 400, "Bad Request",
|
|
|
|
"Variable name is required");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-07-08 14:46:20 +00:00
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
2013-08-21 16:23:59 +00:00
|
|
|
/* response filled in by find_control */
|
2013-07-08 14:46:20 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
value = stasis_app_control_get_channel_var(control, args->variable);
|
|
|
|
|
|
|
|
if (!(json = ast_json_pack("{s: s}", "value", S_OR(value, "")))) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_alloc_failed(response);
|
2013-07-08 14:46:20 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_ok(response, ast_json_ref(json));
|
2013-07-08 14:46:20 +00:00
|
|
|
}
|
|
|
|
|
2013-11-07 21:10:31 +00:00
|
|
|
void ast_ari_channels_set_channel_var(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_set_channel_var_args *args,
|
|
|
|
struct ast_ari_response *response)
|
2013-07-08 14:46:20 +00:00
|
|
|
{
|
|
|
|
RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
|
|
|
|
|
|
|
|
ast_assert(response != NULL);
|
|
|
|
|
|
|
|
if (ast_strlen_zero(args->variable)) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-08 14:46:20 +00:00
|
|
|
response, 400, "Bad Request",
|
|
|
|
"Variable name is required");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-08-21 16:23:59 +00:00
|
|
|
control = find_control(response, args->channel_id);
|
|
|
|
if (control == NULL) {
|
|
|
|
/* response filled in by find_control */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-07-08 14:46:20 +00:00
|
|
|
if (stasis_app_control_set_channel_var(control, args->variable, args->value)) {
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_error(
|
2013-07-08 14:46:20 +00:00
|
|
|
response, 400, "Bad Request",
|
|
|
|
"Failed to execute function");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
ast_ari_response_no_content(response);
|
2013-07-08 14:46:20 +00:00
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
static void ari_channels_handle_snoop_channel(
|
|
|
|
const char *args_channel_id,
|
|
|
|
const char *args_spy,
|
|
|
|
const char *args_whisper,
|
|
|
|
const char *args_app,
|
|
|
|
const char *args_app_args,
|
|
|
|
const char *args_snoop_id,
|
|
|
|
struct ast_ari_response *response)
|
2013-11-23 12:40:46 +00:00
|
|
|
{
|
|
|
|
enum stasis_app_snoop_direction spy, whisper;
|
|
|
|
RAII_VAR(struct ast_channel *, chan, NULL, ast_channel_cleanup);
|
|
|
|
RAII_VAR(struct ast_channel *, snoop, NULL, ast_channel_cleanup);
|
|
|
|
RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);
|
|
|
|
|
|
|
|
ast_assert(response != NULL);
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
if (ast_strlen_zero(args_spy) || !strcmp(args_spy, "none")) {
|
2013-11-23 12:40:46 +00:00
|
|
|
spy = STASIS_SNOOP_DIRECTION_NONE;
|
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
2014-03-07 15:47:55 +00:00
|
|
|
} else if (!strcmp(args_spy, "both")) {
|
2013-11-23 12:40:46 +00:00
|
|
|
spy = STASIS_SNOOP_DIRECTION_BOTH;
|
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
2014-03-07 15:47:55 +00:00
|
|
|
} else if (!strcmp(args_spy, "out")) {
|
2013-11-23 12:40:46 +00:00
|
|
|
spy = STASIS_SNOOP_DIRECTION_OUT;
|
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
2014-03-07 15:47:55 +00:00
|
|
|
} else if (!strcmp(args_spy, "in")) {
|
2013-11-23 12:40:46 +00:00
|
|
|
spy = STASIS_SNOOP_DIRECTION_IN;
|
|
|
|
} else {
|
|
|
|
ast_ari_response_error(
|
|
|
|
response, 400, "Bad Request",
|
|
|
|
"Invalid direction specified for spy");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
if (ast_strlen_zero(args_whisper) || !strcmp(args_whisper, "none")) {
|
2013-11-23 12:40:46 +00:00
|
|
|
whisper = STASIS_SNOOP_DIRECTION_NONE;
|
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
2014-03-07 15:47:55 +00:00
|
|
|
} else if (!strcmp(args_whisper, "both")) {
|
2013-11-23 12:40:46 +00:00
|
|
|
whisper = STASIS_SNOOP_DIRECTION_BOTH;
|
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
2014-03-07 15:47:55 +00:00
|
|
|
} else if (!strcmp(args_whisper, "out")) {
|
2013-11-23 12:40:46 +00:00
|
|
|
whisper = STASIS_SNOOP_DIRECTION_OUT;
|
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
2014-03-07 15:47:55 +00:00
|
|
|
} else if (!strcmp(args_whisper, "in")) {
|
2013-11-23 12:40:46 +00:00
|
|
|
whisper = STASIS_SNOOP_DIRECTION_IN;
|
|
|
|
} else {
|
|
|
|
ast_ari_response_error(
|
|
|
|
response, 400, "Bad Request",
|
|
|
|
"Invalid direction specified for whisper");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (spy == STASIS_SNOOP_DIRECTION_NONE && whisper == STASIS_SNOOP_DIRECTION_NONE) {
|
|
|
|
ast_ari_response_error(
|
|
|
|
response, 400, "Bad Request",
|
|
|
|
"Direction must be specified for at least spy or whisper");
|
|
|
|
return;
|
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
2014-03-07 15:47:55 +00:00
|
|
|
} else if (ast_strlen_zero(args_app)) {
|
2013-11-23 12:40:46 +00:00
|
|
|
ast_ari_response_error(
|
|
|
|
response, 400, "Bad Request",
|
|
|
|
"Application name is required");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
chan = ast_channel_get_by_name(args_channel_id);
|
2013-11-23 12:40:46 +00:00
|
|
|
if (chan == NULL) {
|
|
|
|
ast_ari_response_error(
|
|
|
|
response, 404, "Channel Not Found",
|
|
|
|
"Provided channel was not found");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
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
2014-03-07 15:47:55 +00:00
|
|
|
snoop = stasis_app_control_snoop(chan, spy, whisper, args_app, args_app_args,
|
|
|
|
args_snoop_id);
|
2013-11-23 12:40:46 +00:00
|
|
|
if (snoop == NULL) {
|
|
|
|
ast_ari_response_error(
|
|
|
|
response, 500, "Internal error",
|
|
|
|
"Snoop channel could not be created");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
snapshot = ast_channel_snapshot_create(snoop);
|
|
|
|
ast_ari_response_ok(response, ast_channel_snapshot_to_json(snapshot, NULL));
|
2013-12-13 17:19:23 +00:00
|
|
|
}
|
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
2014-03-07 15:47:55 +00:00
|
|
|
|
|
|
|
void ast_ari_channels_snoop_channel(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_snoop_channel_args *args,
|
|
|
|
struct ast_ari_response *response)
|
|
|
|
{
|
|
|
|
ari_channels_handle_snoop_channel(
|
|
|
|
args->channel_id,
|
|
|
|
args->spy,
|
|
|
|
args->whisper,
|
|
|
|
args->app,
|
|
|
|
args->app_args,
|
|
|
|
args->snoop_id,
|
|
|
|
response);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ast_ari_channels_snoop_channel_with_id(struct ast_variable *headers,
|
|
|
|
struct ast_ari_channels_snoop_channel_with_id_args *args,
|
|
|
|
struct ast_ari_response *response)
|
|
|
|
{
|
|
|
|
ari_channels_handle_snoop_channel(
|
|
|
|
args->channel_id,
|
|
|
|
args->spy,
|
|
|
|
args->whisper,
|
|
|
|
args->app,
|
|
|
|
args->app_args,
|
|
|
|
args->snoop_id,
|
|
|
|
response);
|
|
|
|
}
|