Multiple revisions 420089-420090,420097
[asterisk/asterisk.git] / res / ari / resource_channels.c
index dd323ba..d0a1be3 100644 (file)
@@ -34,13 +34,16 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
-#include "asterisk/dial.h"
 #include "asterisk/bridge.h"
 #include "asterisk/callerid.h"
 #include "asterisk/stasis_app.h"
 #include "asterisk/stasis_app_playback.h"
 #include "asterisk/stasis_app_recording.h"
+#include "asterisk/stasis_app_snoop.h"
 #include "asterisk/stasis_channels.h"
+#include "asterisk/causes.h"
+#include "asterisk/format_cache.h"
+#include "asterisk/core_local.h"
 #include "resource_channels.h"
 
 #include <limits.h>
@@ -81,16 +84,21 @@ static struct stasis_app_control *find_control(
        return control;
 }
 
-void ast_ari_dial(struct ast_variable *headers, struct ast_dial_args *args, struct ast_ari_response *response)
+void ast_ari_channels_continue_in_dialplan(
+       struct ast_variable *headers,
+       struct ast_ari_channels_continue_in_dialplan_args *args,
+       struct ast_ari_response *response)
 {
-       struct stasis_app_control *control;
+       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;
        }
 
-       if (stasis_app_control_dial(control, args->endpoint, args->timeout)) {
+       if (stasis_app_control_continue(control, args->context, args->extension, args->priority)) {
                ast_ari_response_alloc_failed(response);
                return;
        }
@@ -98,31 +106,30 @@ void ast_ari_dial(struct ast_variable *headers, struct ast_dial_args *args, stru
        ast_ari_response_no_content(response);
 }
 
-void ast_ari_continue_in_dialplan(
-       struct ast_variable *headers,
-       struct ast_continue_in_dialplan_args *args,
+void ast_ari_channels_answer(struct ast_variable *headers,
+       struct ast_ari_channels_answer_args *args,
        struct ast_ari_response *response)
 {
        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;
        }
 
-       if (stasis_app_control_continue(control, args->context, args->extension, args->priority)) {
-               ast_ari_response_alloc_failed(response);
+       if (stasis_app_control_answer(control) != 0) {
+               ast_ari_response_error(
+                       response, 500, "Internal Server Error",
+                       "Failed to answer channel");
                return;
        }
 
        ast_ari_response_no_content(response);
 }
 
-void ast_ari_answer_channel(struct ast_variable *headers,
-                               struct ast_answer_channel_args *args,
-                               struct ast_ari_response *response)
+void ast_ari_channels_ring(struct ast_variable *headers,
+       struct ast_ari_channels_ring_args *args,
+       struct ast_ari_response *response)
 {
        RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 
@@ -131,17 +138,30 @@ void ast_ari_answer_channel(struct ast_variable *headers,
                return;
        }
 
-       if (stasis_app_control_answer(control) != 0) {
-               ast_ari_response_error(
-                       response, 500, "Internal Server Error",
-                       "Failed to answer channel");
+       stasis_app_control_ring(control);
+
+       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);
+
        ast_ari_response_no_content(response);
 }
 
-void ast_ari_mute_channel(struct ast_variable *headers, struct ast_mute_channel_args *args, struct ast_ari_response *response)
+void ast_ari_channels_mute(struct ast_variable *headers,
+       struct ast_ari_channels_mute_args *args,
+       struct ast_ari_response *response)
 {
        RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
        unsigned int direction = 0;
@@ -152,6 +172,13 @@ void ast_ari_mute_channel(struct ast_variable *headers, struct ast_mute_channel_
                return;
        }
 
+       if (ast_strlen_zero(args->direction)) {
+               ast_ari_response_error(
+                       response, 400, "Bad Request",
+                       "Direction is required");
+               return;
+       }
+
        if (!strcmp(args->direction, "in")) {
                direction = AST_MUTE_DIRECTION_READ;
        } else if (!strcmp(args->direction, "out")) {
@@ -170,7 +197,9 @@ void ast_ari_mute_channel(struct ast_variable *headers, struct ast_mute_channel_
        ast_ari_response_no_content(response);
 }
 
-void ast_ari_unmute_channel(struct ast_variable *headers, struct ast_unmute_channel_args *args, struct ast_ari_response *response)
+void ast_ari_channels_unmute(struct ast_variable *headers,
+       struct ast_ari_channels_unmute_args *args,
+       struct ast_ari_response *response)
 {
        RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
        unsigned int direction = 0;
@@ -181,6 +210,13 @@ void ast_ari_unmute_channel(struct ast_variable *headers, struct ast_unmute_chan
                return;
        }
 
+       if (ast_strlen_zero(args->direction)) {
+               ast_ari_response_error(
+                       response, 400, "Bad Request",
+                       "Direction is required");
+               return;
+       }
+
        if (!strcmp(args->direction, "in")) {
                direction = AST_MUTE_DIRECTION_READ;
        } else if (!strcmp(args->direction, "out")) {
@@ -199,7 +235,32 @@ void ast_ari_unmute_channel(struct ast_variable *headers, struct ast_unmute_chan
        ast_ari_response_no_content(response);
 }
 
-void ast_ari_hold_channel(struct ast_variable *headers, struct ast_hold_channel_args *args, struct ast_ari_response *response)
+void ast_ari_channels_send_dtmf(struct ast_variable *headers,
+       struct ast_ari_channels_send_dtmf_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;
+       }
+
+       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);
+}
+
+void ast_ari_channels_hold(struct ast_variable *headers,
+       struct ast_ari_channels_hold_args *args,
+       struct ast_ari_response *response)
 {
        RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 
@@ -214,7 +275,9 @@ void ast_ari_hold_channel(struct ast_variable *headers, struct ast_hold_channel_
        ast_ari_response_no_content(response);
 }
 
-void ast_ari_unhold_channel(struct ast_variable *headers, struct ast_unhold_channel_args *args, struct ast_ari_response *response)
+void ast_ari_channels_unhold(struct ast_variable *headers,
+       struct ast_ari_channels_unhold_args *args,
+       struct ast_ari_response *response)
 {
        RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 
@@ -229,7 +292,9 @@ void ast_ari_unhold_channel(struct ast_variable *headers, struct ast_unhold_chan
        ast_ari_response_no_content(response);
 }
 
-void ast_ari_moh_start_channel(struct ast_variable *headers, struct ast_moh_start_channel_args *args, struct ast_ari_response *response)
+void ast_ari_channels_start_moh(struct ast_variable *headers,
+       struct ast_ari_channels_start_moh_args *args,
+       struct ast_ari_response *response)
 {
        RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 
@@ -243,7 +308,9 @@ void ast_ari_moh_start_channel(struct ast_variable *headers, struct ast_moh_star
        ast_ari_response_no_content(response);
 }
 
-void ast_ari_moh_stop_channel(struct ast_variable *headers, struct ast_moh_stop_channel_args *args, struct ast_ari_response *response)
+void ast_ari_channels_stop_moh(struct ast_variable *headers,
+       struct ast_ari_channels_stop_moh_args *args,
+       struct ast_ari_response *response)
 {
        RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 
@@ -257,20 +324,57 @@ void ast_ari_moh_stop_channel(struct ast_variable *headers, struct ast_moh_stop_
        ast_ari_response_no_content(response);
 }
 
-void ast_ari_play_on_channel(struct ast_variable *headers,
-       struct ast_play_on_channel_args *args,
+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);
+}
+
+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,
        struct ast_ari_response *response)
 {
        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);
-       RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
+       struct ast_json *json;
        const char *language;
 
        ast_assert(response != NULL);
 
-       control = find_control(response, args->channel_id);
+       control = find_control(response, args_channel_id);
        if (control == NULL) {
                /* Response filled in by find_control */
                return;
@@ -284,24 +388,24 @@ void ast_ari_play_on_channel(struct ast_variable *headers,
                return;
        }
 
-       if (args->skipms < 0) {
+       if (args_skipms < 0) {
                ast_ari_response_error(
                        response, 400, "Bad Request",
                        "skipms cannot be negative");
                return;
        }
 
-       if (args->offsetms < 0) {
+       if (args_offsetms < 0) {
                ast_ari_response_error(
                        response, 400, "Bad Request",
                        "offsetms cannot be negative");
                return;
        }
 
-       language = S_OR(args->lang, snapshot->language);
+       language = S_OR(args_lang, snapshot->language);
 
-       playback = stasis_app_control_play_uri(control, args->media, language,
-               args->channel_id, STASIS_PLAYBACK_TARGET_CHANNEL, args->skipms, args->offsetms);
+       playback = stasis_app_control_play_uri(control, args_media, language,
+               args_channel_id, STASIS_PLAYBACK_TARGET_CHANNEL, args_skipms, args_offsetms, args_playback_id);
        if (!playback) {
                ast_ari_response_error(
                        response, 500, "Internal Server Error",
@@ -309,9 +413,9 @@ void ast_ari_play_on_channel(struct ast_variable *headers,
                return;
        }
 
-       ast_asprintf(&playback_url, "/playback/%s",
-               stasis_app_playback_get_id(playback));
-       if (!playback_url) {
+       if (ast_asprintf(&playback_url, "/playback/%s",
+                       stasis_app_playback_get_id(playback)) == -1) {
+               playback_url = NULL;
                ast_ari_response_error(
                        response, 500, "Internal Server Error",
                        "Out of memory");
@@ -329,15 +433,42 @@ void ast_ari_play_on_channel(struct ast_variable *headers,
        ast_ari_response_created(response, playback_url, json);
 }
 
-void ast_ari_record_channel(struct ast_variable *headers,
-       struct ast_record_channel_args *args,
+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);
+}
+
+void ast_ari_channels_record(struct ast_variable *headers,
+       struct ast_ari_channels_record_args *args,
        struct ast_ari_response *response)
 {
        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_recording *, recording, NULL, ao2_cleanup);
        RAII_VAR(char *, recording_url, NULL, ast_free);
-       RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
+       struct ast_json *json;
        RAII_VAR(struct stasis_app_recording_options *, options, NULL,
                ao2_cleanup);
        RAII_VAR(char *, uri_encoded_name, NULL, ast_free);
@@ -371,6 +502,7 @@ void ast_ari_record_channel(struct ast_variable *headers,
                        response, 500, "Internal Server Error",
                        "Out of memory");
        }
+       ast_string_field_build(options, target, "channel:%s", args->channel_id);
        options->max_silence_seconds = args->max_silence_seconds;
        options->max_duration_seconds = args->max_duration_seconds;
        options->terminate_on =
@@ -393,6 +525,13 @@ void ast_ari_record_channel(struct ast_variable *headers,
                return;
        }
 
+       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;
+       }
+
        recording = stasis_app_control_record(control, options);
        if (recording == NULL) {
                switch(errno) {
@@ -406,7 +545,7 @@ void ast_ari_record_channel(struct ast_variable *headers,
                        break;
                case EEXIST:
                        ast_ari_response_error(response, 409, "Conflict",
-                               "Recording '%s' already in progress",
+                               "Recording '%s' already exists and can not be overwritten",
                                args->name);
                        break;
                case ENOMEM:
@@ -442,8 +581,9 @@ void ast_ari_record_channel(struct ast_variable *headers,
        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) {
+       if (ast_asprintf(&recording_url, "/recordings/live/%s",
+                       uri_encoded_name) == -1) {
+               recording_url = NULL;
                ast_ari_response_error(
                        response, 500, "Internal Server Error",
                        "Out of memory");
@@ -461,9 +601,9 @@ void ast_ari_record_channel(struct ast_variable *headers,
        ast_ari_response_created(response, recording_url, json);
 }
 
-void ast_ari_get_channel(struct ast_variable *headers,
-                            struct ast_get_channel_args *args,
-                            struct ast_ari_response *response)
+void ast_ari_channels_get(struct ast_variable *headers,
+       struct ast_ari_channels_get_args *args,
+       struct ast_ari_response *response)
 {
        RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup);
        struct stasis_cache *cache;
@@ -478,7 +618,7 @@ void ast_ari_get_channel(struct ast_variable *headers,
        }
 
        msg = stasis_cache_get(cache, ast_channel_snapshot_type(),
-                              args->channel_id);
+                                  args->channel_id);
        if (!msg) {
                ast_ari_response_error(
                        response, 404, "Not Found",
@@ -490,14 +630,15 @@ void ast_ari_get_channel(struct ast_variable *headers,
        ast_assert(snapshot != NULL);
 
        ast_ari_response_ok(response,
-                               ast_channel_snapshot_to_json(snapshot));
+                               ast_channel_snapshot_to_json(snapshot, NULL));
 }
 
-void ast_ari_delete_channel(struct ast_variable *headers,
-                               struct ast_delete_channel_args *args,
-                               struct ast_ari_response *response)
+void ast_ari_channels_hangup(struct ast_variable *headers,
+       struct ast_ari_channels_hangup_args *args,
+       struct ast_ari_response *response)
 {
        RAII_VAR(struct ast_channel *, chan, NULL, ao2_cleanup);
+       int cause;
 
        chan = ast_channel_get_by_name(args->channel_id);
        if (chan == NULL) {
@@ -507,20 +648,35 @@ void ast_ari_delete_channel(struct ast_variable *headers,
                return;
        }
 
+       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);
        ast_softhangup(chan, AST_SOFTHANGUP_EXPLICIT);
 
        ast_ari_response_no_content(response);
 }
 
-void ast_ari_get_channels(struct ast_variable *headers,
-                             struct ast_get_channels_args *args,
-                             struct ast_ari_response *response)
+void ast_ari_channels_list(struct ast_variable *headers,
+       struct ast_ari_channels_list_args *args,
+       struct ast_ari_response *response)
 {
        RAII_VAR(struct stasis_cache *, cache, NULL, ao2_cleanup);
        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;
+       struct stasis_message_sanitizer *sanitize = stasis_app_get_sanitizer();
 
        cache = ast_channel_cache();
        if (!cache) {
@@ -547,10 +703,18 @@ void ast_ari_get_channels(struct ast_variable *headers,
        while ((obj = ao2_iterator_next(&i))) {
                RAII_VAR(struct stasis_message *, msg, obj, ao2_cleanup);
                struct ast_channel_snapshot *snapshot = stasis_message_data(msg);
-               int r = ast_json_array_append(
-                       json, ast_channel_snapshot_to_json(snapshot));
+               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));
                if (r != 0) {
                        ast_ari_response_alloc_failed(response);
+                       ao2_iterator_destroy(&i);
                        return;
                }
        }
@@ -559,9 +723,18 @@ void ast_ari_get_channels(struct ast_variable *headers,
        ast_ari_response_ok(response, ast_json_ref(json));
 }
 
-void ast_ari_originate(struct ast_variable *headers,
-                          struct ast_originate_args *args,
-                          struct ast_ari_response *response)
+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,
+       struct ast_ari_response *response)
 {
        char *dialtech;
        char dialdevice[AST_CHANNEL_NAME];
@@ -569,16 +742,37 @@ void ast_ari_originate(struct ast_variable *headers,
        char *cid_num = NULL;
        char *cid_name = NULL;
        int timeout = 30000;
-
+       RAII_VAR(struct ast_format_cap *, cap,
+               ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT), ao2_cleanup);
        char *stuff;
+       struct ast_channel *chan;
+       struct ast_channel *local_peer;
+       RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);
+       struct ast_assigned_ids assignedids = {
+               .uniqueid = args_channel_id,
+               .uniqueid2 = args_other_channel_id,
+       };
 
-       if (ast_strlen_zero(args->endpoint)) {
+       if (!cap) {
+               ast_ari_response_alloc_failed(response);
+               return;
+       }
+       ast_format_cap_append(cap, ast_format_slin, 0);
+
+       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", AST_MAX_PUBLIC_UNIQUEID);
+               return;
+       }
+
+       if (ast_strlen_zero(args_endpoint)) {
                ast_ari_response_error(response, 400, "Bad Request",
                        "Endpoint must be specified");
                return;
        }
 
-       dialtech = ast_strdupa(args->endpoint);
+       dialtech = ast_strdupa(args_endpoint);
        if ((stuff = strchr(dialtech, '/'))) {
                *stuff++ = '\0';
                ast_copy_string(dialdevice, stuff, sizeof(dialdevice));
@@ -590,14 +784,14 @@ void ast_ari_originate(struct ast_variable *headers,
                return;
        }
 
-       if (args->timeout > 0) {
-               timeout = args->timeout * 1000;
-       } else if (args->timeout == -1) {
+       if (args_timeout > 0) {
+               timeout = args_timeout * 1000;
+       } else if (args_timeout == -1) {
                timeout = -1;
        }
 
-       if (!ast_strlen_zero(args->caller_id)) {
-               caller_id = ast_strdupa(args->caller_id);
+       if (!ast_strlen_zero(args_caller_id)) {
+               caller_id = ast_strdupa(args_caller_id);
                ast_callerid_parse(caller_id, &cid_name, &cid_num);
 
                if (ast_is_shrinkable_phonenumber(cid_num)) {
@@ -605,7 +799,7 @@ void ast_ari_originate(struct ast_variable *headers,
                }
        }
 
-       if (!ast_strlen_zero(args->app)) {
+       if (!ast_strlen_zero(args_app)) {
                const char *app = "Stasis";
 
                RAII_VAR(struct ast_str *, appdata, ast_str_create(64), ast_free);
@@ -615,19 +809,19 @@ void ast_ari_originate(struct ast_variable *headers,
                        return;
                }
 
-               ast_str_set(&appdata, 0, "%s", args->app);
-               if (!ast_strlen_zero(args->app_args)) {
-                       ast_str_append(&appdata, 0, ",%s", args->app_args);
+               ast_str_set(&appdata, 0, "%s", args_app);
+               if (!ast_strlen_zero(args_app_args)) {
+                       ast_str_append(&appdata, 0, ",%s", args_app_args);
                }
 
                /* 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, cap, dialdevice, timeout, app, ast_str_buffer(appdata), NULL, 0, cid_num, cid_name, variables, NULL, &chan, &assignedids)) {
                        ast_ari_response_alloc_failed(response);
                        return;
                }
-       } else if (!ast_strlen_zero(args->extension)) {
+       } 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, 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)) {
                        ast_ari_response_alloc_failed(response);
                        return;
                }
@@ -637,10 +831,101 @@ void ast_ari_originate(struct ast_variable *headers,
                return;
        }
 
-       ast_ari_response_no_content(response);
+       /* See if this is a Local channel and if so, get the peer */
+       local_peer = ast_local_get_peer(chan);
+
+       if (!ast_strlen_zero(args_app)) {
+               stasis_app_subscribe_channel(args_app, chan);
+               if (local_peer) {
+                       stasis_app_subscribe_channel(args_app, local_peer);
+               }
+       }
+
+       snapshot = ast_channel_snapshot_get_latest(ast_channel_uniqueid(chan));
+       ast_channel_unlock(chan);
+
+       ast_ari_response_ok(response, ast_channel_snapshot_to_json(snapshot, NULL));
+       ast_channel_unref(chan);
+       if (local_peer) {
+               ast_channel_unref(local_peer);
+       }
+}
+
+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 (ast_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 (ast_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_get_channel_var(struct ast_variable *headers, struct ast_get_channel_var_args *args, struct ast_ari_response *response)
+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)
 {
        RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
        RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
@@ -648,8 +933,16 @@ void ast_ari_get_channel_var(struct ast_variable *headers, struct ast_get_channe
 
        ast_assert(response != NULL);
 
+       if (ast_strlen_zero(args->variable)) {
+               ast_ari_response_error(
+                       response, 400, "Bad Request",
+                       "Variable name is required");
+               return;
+       }
+
        control = find_control(response, args->channel_id);
        if (control == NULL) {
+               /* response filled in by find_control */
                return;
        }
 
@@ -663,17 +956,14 @@ void ast_ari_get_channel_var(struct ast_variable *headers, struct ast_get_channe
        ast_ari_response_ok(response, ast_json_ref(json));
 }
 
-void ast_ari_set_channel_var(struct ast_variable *headers, struct ast_set_channel_var_args *args, struct ast_ari_response *response)
+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)
 {
        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;
-       }
-
        if (ast_strlen_zero(args->variable)) {
                ast_ari_response_error(
                        response, 400, "Bad Request",
@@ -681,6 +971,12 @@ void ast_ari_set_channel_var(struct ast_variable *headers, struct ast_set_channe
                return;
        }
 
+       control = find_control(response, args->channel_id);
+       if (control == NULL) {
+               /* response filled in by find_control */
+               return;
+       }
+
        if (stasis_app_control_set_channel_var(control, args->variable, args->value)) {
                ast_ari_response_error(
                        response, 400, "Bad Request",
@@ -691,3 +987,109 @@ void ast_ari_set_channel_var(struct ast_variable *headers, struct ast_set_channe
        ast_ari_response_no_content(response);
 }
 
+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)
+{
+       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);
+
+       if (ast_strlen_zero(args_spy) || !strcmp(args_spy, "none")) {
+               spy = STASIS_SNOOP_DIRECTION_NONE;
+       } else if (!strcmp(args_spy, "both")) {
+               spy = STASIS_SNOOP_DIRECTION_BOTH;
+       } else if (!strcmp(args_spy, "out")) {
+               spy = STASIS_SNOOP_DIRECTION_OUT;
+       } else if (!strcmp(args_spy, "in")) {
+               spy = STASIS_SNOOP_DIRECTION_IN;
+       } else {
+               ast_ari_response_error(
+                       response, 400, "Bad Request",
+                       "Invalid direction specified for spy");
+               return;
+       }
+
+       if (ast_strlen_zero(args_whisper) || !strcmp(args_whisper, "none")) {
+               whisper = STASIS_SNOOP_DIRECTION_NONE;
+       } else if (!strcmp(args_whisper, "both")) {
+               whisper = STASIS_SNOOP_DIRECTION_BOTH;
+       } else if (!strcmp(args_whisper, "out")) {
+               whisper = STASIS_SNOOP_DIRECTION_OUT;
+       } else if (!strcmp(args_whisper, "in")) {
+               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;
+       } else if (ast_strlen_zero(args_app)) {
+               ast_ari_response_error(
+                       response, 400, "Bad Request",
+                       "Application name is required");
+               return;
+       }
+
+       chan = ast_channel_get_by_name(args_channel_id);
+       if (chan == NULL) {
+               ast_ari_response_error(
+                       response, 404, "Channel Not Found",
+                       "Provided channel was not found");
+               return;
+       }
+
+       snoop = stasis_app_control_snoop(chan, spy, whisper, args_app, args_app_args,
+               args_snoop_id);
+       if (snoop == NULL) {
+               ast_ari_response_error(
+                       response, 500, "Internal error",
+                       "Snoop channel could not be created");
+               return;
+       }
+
+       snapshot = ast_channel_snapshot_get_latest(ast_channel_uniqueid(snoop));
+       ast_ari_response_ok(response, ast_channel_snapshot_to_json(snapshot, NULL));
+}
+
+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);
+}