From fb8a2e039978b264737aa7a4ed08f9af4c329f47 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Tue, 27 Jan 2015 17:21:03 +0000 Subject: ARI: Improve wiki documentation This patch improves the documentation of ARI on the wiki. Specifically, it addresses the following: * Allowed values and allowed ranges weren't documented. This was particularly frustrating, as Asterisk would reject query parameters with disallowed values - but we didn't tell anyone what the allowed values were. * The /play/id operation on /channels and /bridges failed to document all of the added media resource types. * Documentation for creating a channel into a Stasis application failed to note when it occurred, and that creating a channel into Stasis conflicts with creating a channel into the dialplan. * Some other minor tweaks in the mustache templates, including italicizing the parameter type, putting the default value on its own sub-bullet, and some other nicities. Review: https://reviewboard.asterisk.org/r/4351 ........ Merged revisions 431145 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@431148 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_ari_bridges.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'res/res_ari_bridges.c') diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c index 1a91af95b..e0b9f789f 100644 --- a/res/res_ari_bridges.c +++ b/res/res_ari_bridges.c @@ -206,9 +206,9 @@ static void ast_ari_bridges_create_cb( fin: __attribute__((unused)) return; } -int ast_ari_bridges_create_or_update_with_id_parse_body( +int ast_ari_bridges_create_with_id_parse_body( struct ast_json *body, - struct ast_ari_bridges_create_or_update_with_id_args *args) + struct ast_ari_bridges_create_with_id_args *args) { struct ast_json *field; /* Parse query parameters out of it */ @@ -230,12 +230,12 @@ int ast_ari_bridges_create_or_update_with_id_parse_body( * \param headers HTTP headers. * \param[out] response Response to the HTTP request. */ -static void ast_ari_bridges_create_or_update_with_id_cb( +static void ast_ari_bridges_create_with_id_cb( struct ast_tcptls_session_instance *ser, struct ast_variable *get_params, struct ast_variable *path_vars, struct ast_variable *headers, struct ast_ari_response *response) { - struct ast_ari_bridges_create_or_update_with_id_args args = {}; + struct ast_ari_bridges_create_with_id_args args = {}; struct ast_variable *i; RAII_VAR(struct ast_json *, body, NULL, ast_json_unref); #if defined(AST_DEVMODE) @@ -273,11 +273,11 @@ static void ast_ari_bridges_create_or_update_with_id_cb( goto fin; } } - if (ast_ari_bridges_create_or_update_with_id_parse_body(body, &args)) { + if (ast_ari_bridges_create_with_id_parse_body(body, &args)) { ast_ari_response_alloc_failed(response); goto fin; } - ast_ari_bridges_create_or_update_with_id(headers, &args, response); + ast_ari_bridges_create_with_id(headers, &args, response); #if defined(AST_DEVMODE) code = response->response_code; @@ -1378,7 +1378,7 @@ static struct stasis_rest_handlers bridges_bridgeId = { .path_segment = "bridgeId", .is_wildcard = 1, .callbacks = { - [AST_HTTP_POST] = ast_ari_bridges_create_or_update_with_id_cb, + [AST_HTTP_POST] = ast_ari_bridges_create_with_id_cb, [AST_HTTP_GET] = ast_ari_bridges_get_cb, [AST_HTTP_DELETE] = ast_ari_bridges_destroy_cb, }, -- cgit v1.2.3