Author: dlee
Date: Mon Jul 29 15:52:43 2013
New Revision: 395709
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395709
Log:
Merge fixes to new content
Modified:
team/dlee/allow-multiple/res/ari/resource_bridges.c
team/dlee/allow-multiple/res/ari/resource_events.c
team/dlee/allow-multiple/res/res_ari_asterisk.c
team/dlee/allow-multiple/res/res_ari_bridges.c
team/dlee/allow-multiple/res/res_ari_events.c
team/dlee/allow-multiple/rest-api-templates/param_parsing.mustache
team/dlee/allow-multiple/rest-api-templates/res_ari_resource.c.mustache
Modified: team/dlee/allow-multiple/res/ari/resource_bridges.c
URL:
http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/ari/resource_bridges.c?view=diff&rev=395709&r1=395708&r2=395709
==============================================================================
--- team/dlee/allow-multiple/res/ari/resource_bridges.c (original)
+++ team/dlee/allow-multiple/res/ari/resource_bridges.c Mon Jul 29 15:52:43 2013
@@ -122,18 +122,18 @@
}
}
-static struct control_list *control_list_create(struct stasis_http_response
*response, size_t count, const char **channels) {
+static struct control_list *control_list_create(struct ast_ari_response
*response, size_t count, const char **channels) {
RAII_VAR(struct control_list *, list, NULL, ao2_cleanup);
size_t i;
if (count == 0 || !channels) {
- stasis_http_response_error(response, 400, "Bad Request",
"Missing parameter channel");
+ ast_ari_response_error(response, 400, "Bad Request", "Missing
parameter channel");
return NULL;
}
list = ao2_alloc(sizeof(*list) + count * sizeof(list->controls[0]),
control_list_dtor);
if (!list) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
return NULL;
}
@@ -150,7 +150,7 @@
}
if (list->count == 0) {
- stasis_http_response_error(response, 400, "Bad Request",
"Missing parameter channel");
+ ast_ari_response_error(response, 400, "Bad Request", "Missing
parameter channel");
return NULL;
}
@@ -205,7 +205,7 @@
* uniqueids don't match */
for (i = 0; i < list->count; ++i) {
if
(stasis_app_control_remove_channel_from_bridge(list->controls[i], bridge)) {
- stasis_http_response_error(response, 500, "Internal
Error",
+ ast_ari_response_error(response, 500, "Internal Error",
"Could not remove channel from bridge");
}
}
Modified: team/dlee/allow-multiple/res/ari/resource_events.c
URL:
http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/ari/resource_events.c?view=diff&rev=395709&r1=395708&r2=395709
==============================================================================
--- team/dlee/allow-multiple/res/ari/resource_events.c (original)
+++ team/dlee/allow-multiple/res/ari/resource_events.c Mon Jul 29 15:52:43 2013
@@ -158,7 +158,8 @@
}
if (ast_str_container_add(session->websocket_apps, app_name)) {
- ast_ari_websocket_session_write(session->ws_session,
ari_oom_json());
+ ast_ari_websocket_session_write(session->ws_session,
+ ast_ari_oom_json());
return -1;
}
Modified: team/dlee/allow-multiple/res/res_ari_asterisk.c
URL:
http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/res_ari_asterisk.c?view=diff&rev=395709&r1=395708&r2=395709
==============================================================================
--- team/dlee/allow-multiple/res/res_ari_asterisk.c (original)
+++ team/dlee/allow-multiple/res/res_ari_asterisk.c Mon Jul 29 15:52:43 2013
@@ -77,19 +77,19 @@
args.only_parse = ast_strdup(i->value);
if (!args.only_parse) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
args.only_count = ast_app_separate_args(
args.only_parse, ',', vals, ARRAY_LEN(vals));
if (args.only_count == 0) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
if (args.only_count >= MAX_VALS) {
- stasis_http_response_error(response, 400,
+ ast_ari_response_error(response, 400,
"Bad Request",
"Too many values for only");
goto fin;
@@ -97,7 +97,7 @@
args.only = ast_malloc(sizeof(*args.only) *
args.only_count);
if (!args.only) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
Modified: team/dlee/allow-multiple/res/res_ari_bridges.c
URL:
http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/res_ari_bridges.c?view=diff&rev=395709&r1=395708&r2=395709
==============================================================================
--- team/dlee/allow-multiple/res/res_ari_bridges.c (original)
+++ team/dlee/allow-multiple/res/res_ari_bridges.c Mon Jul 29 15:52:43 2013
@@ -296,19 +296,19 @@
args.channel_parse = ast_strdup(i->value);
if (!args.channel_parse) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
args.channel_count = ast_app_separate_args(
args.channel_parse, ',', vals, ARRAY_LEN(vals));
if (args.channel_count == 0) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
if (args.channel_count >= MAX_VALS) {
- stasis_http_response_error(response, 400,
+ ast_ari_response_error(response, 400,
"Bad Request",
"Too many values for channel");
goto fin;
@@ -316,7 +316,7 @@
args.channel = ast_malloc(sizeof(*args.channel) *
args.channel_count);
if (!args.channel) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
@@ -395,19 +395,19 @@
args.channel_parse = ast_strdup(i->value);
if (!args.channel_parse) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
args.channel_count = ast_app_separate_args(
args.channel_parse, ',', vals, ARRAY_LEN(vals));
if (args.channel_count == 0) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
if (args.channel_count >= MAX_VALS) {
- stasis_http_response_error(response, 400,
+ ast_ari_response_error(response, 400,
"Bad Request",
"Too many values for channel");
goto fin;
@@ -415,7 +415,7 @@
args.channel = ast_malloc(sizeof(*args.channel) *
args.channel_count);
if (!args.channel) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
Modified: team/dlee/allow-multiple/res/res_ari_events.c
URL:
http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/res_ari_events.c?view=diff&rev=395709&r1=395708&r2=395709
==============================================================================
--- team/dlee/allow-multiple/res/res_ari_events.c (original)
+++ team/dlee/allow-multiple/res/res_ari_events.c Mon Jul 29 15:52:43 2013
@@ -55,7 +55,7 @@
struct ast_variable *get_params, struct ast_variable *headers)
{
struct ast_event_websocket_args args = {};
- RAII_VAR(struct stasis_http_response *, response, NULL, ast_free);
+ RAII_VAR(struct ast_ari_response *, response, NULL, ast_free);
struct ast_variable *i;
RAII_VAR(struct ast_websocket *, s, ws_session, ast_websocket_unref);
RAII_VAR(struct ast_ari_websocket_session *, session, NULL,
ao2_cleanup);
@@ -85,19 +85,19 @@
args.app_parse = ast_strdup(i->value);
if (!args.app_parse) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
args.app_count = ast_app_separate_args(
args.app_parse, ',', vals, ARRAY_LEN(vals));
if (args.app_count == 0) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
if (args.app_count >= MAX_VALS) {
- stasis_http_response_error(response, 400,
+ ast_ari_response_error(response, 400,
"Bad Request",
"Too many values for app");
goto fin;
@@ -105,7 +105,7 @@
args.app = ast_malloc(sizeof(*args.app) *
args.app_count);
if (!args.app) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
Modified: team/dlee/allow-multiple/rest-api-templates/param_parsing.mustache
URL:
http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/rest-api-templates/param_parsing.mustache?view=diff&rev=395709&r1=395708&r2=395709
==============================================================================
--- team/dlee/allow-multiple/rest-api-templates/param_parsing.mustache
(original)
+++ team/dlee/allow-multiple/rest-api-templates/param_parsing.mustache Mon Jul
29 15:52:43 2013
@@ -32,19 +32,19 @@
args.{{c_name}}_parse = ast_strdup(i->value);
if (!args.{{c_name}}_parse) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
args.{{c_name}}_count = ast_app_separate_args(
args.{{c_name}}_parse, ',', vals,
ARRAY_LEN(vals));
if (args.{{c_name}}_count == 0) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
if (args.{{c_name}}_count >= MAX_VALS) {
- stasis_http_response_error(response, 400,
+ ast_ari_response_error(response, 400,
"Bad Request",
"Too many values for {{c_name}}");
goto fin;
@@ -52,7 +52,7 @@
args.{{c_name}} = ast_malloc(sizeof(*args.{{c_name}}) *
args.{{c_name}}_count);
if (!args.{{c_name}}) {
- stasis_http_response_alloc_failed(response);
+ ast_ari_response_alloc_failed(response);
goto fin;
}
Modified:
team/dlee/allow-multiple/rest-api-templates/res_ari_resource.c.mustache
URL:
http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/rest-api-templates/res_ari_resource.c.mustache?view=diff&rev=395709&r1=395708&r2=395709
==============================================================================
--- team/dlee/allow-multiple/rest-api-templates/res_ari_resource.c.mustache
(original)
+++ team/dlee/allow-multiple/rest-api-templates/res_ari_resource.c.mustache Mon
Jul 29 15:52:43 2013
@@ -131,7 +131,7 @@
{
struct ast_{{c_nickname}}_args args = {};
{{#has_parameters}}
- RAII_VAR(struct stasis_http_response *, response, NULL, ast_free);
+ RAII_VAR(struct ast_ari_response *, response, NULL, ast_free);
struct ast_variable *i;
{{/has_parameters}}
RAII_VAR(struct ast_websocket *, s, ws_session, ast_websocket_unref);
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
