kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use POST / DELETE to toggle ARI bridge moh

Browse Source 
Review: https://reviewboard.asterisk.org/r/2911/
........

Merged revisions 401040 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Belanger
2013-10-16 00:12:36 +00:00
parent ef7c5a04c0
commit 7955e89d06
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
res/res_ari_bridges.c
View File

@@ -490,7 +490,7 @@ fin: __attribute__((unused))
return; return;
} }
/*! /*!
* \brief Parameter parsing callback for /bridges/{bridgeId}/mohStart. * \brief Parameter parsing callback for /bridges/{bridgeId}/moh.
* \param get_params GET parameters in the HTTP request. * \param get_params GET parameters in the HTTP request.
* \param path_vars Path variables extracted from the request. * \param path_vars Path variables extracted from the request.
* \param headers HTTP headers. * \param headers HTTP headers.
@@ -538,13 +538,13 @@ static void ast_ari_moh_start_bridge_cb(
is_valid = ast_ari_validate_void( is_valid = ast_ari_validate_void(
response->message); response->message);
} else { } else {
ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/mohStart\n", code); ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/moh\n", code);
is_valid = 0; is_valid = 0;
} }
} }
if (!is_valid) { if (!is_valid) {
ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/mohStart\n"); ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/moh\n");
ast_ari_response_error(response, 500, ast_ari_response_error(response, 500,
"Internal Server Error", "Response validation failed"); "Internal Server Error", "Response validation failed");
} }
@@ -554,7 +554,7 @@ fin: __attribute__((unused))
return; return;
} }
/*! /*!
* \brief Parameter parsing callback for /bridges/{bridgeId}/mohStop. * \brief Parameter parsing callback for /bridges/{bridgeId}/moh.
* \param get_params GET parameters in the HTTP request. * \param get_params GET parameters in the HTTP request.
* \param path_vars Path variables extracted from the request. * \param path_vars Path variables extracted from the request.
* \param headers HTTP headers. * \param headers HTTP headers.
@@ -596,13 +596,13 @@ static void ast_ari_moh_stop_bridge_cb(
is_valid = ast_ari_validate_void( is_valid = ast_ari_validate_void(
response->message); response->message);
} else { } else {
ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/mohStop\n", code); ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/moh\n", code);
is_valid = 0; is_valid = 0;
} }
} }
if (!is_valid) { if (!is_valid) {
ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/mohStop\n"); ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/moh\n");
ast_ari_response_error(response, 500, ast_ari_response_error(response, 500,
"Internal Server Error", "Response validation failed"); "Internal Server Error", "Response validation failed");
} }
@@ -787,19 +787,11 @@ static struct stasis_rest_handlers bridges_bridgeId_removeChannel = {
.children = { } .children = { }
}; };
/*! \brief REST handler for /api-docs/bridges.{format} */ /*! \brief REST handler for /api-docs/bridges.{format} */
static struct stasis_rest_handlers bridges_bridgeId_mohStart = { static struct stasis_rest_handlers bridges_bridgeId_moh = {
.path_segment = "mohStart", .path_segment = "moh",
.callbacks = { .callbacks = {
[AST_HTTP_POST] = ast_ari_moh_start_bridge_cb, [AST_HTTP_POST] = ast_ari_moh_start_bridge_cb,
}, [AST_HTTP_DELETE] = ast_ari_moh_stop_bridge_cb,
.num_children = 0,
.children = { }
};
/*! \brief REST handler for /api-docs/bridges.{format} */
static struct stasis_rest_handlers bridges_bridgeId_mohStop = {
.path_segment = "mohStop",
.callbacks = {
[AST_HTTP_POST] = ast_ari_moh_stop_bridge_cb,
}, },
.num_children = 0, .num_children = 0,
.children = { } .children = { }
@@ -830,8 +822,8 @@ static struct stasis_rest_handlers bridges_bridgeId = {
[AST_HTTP_GET] = ast_ari_get_bridge_cb, [AST_HTTP_GET] = ast_ari_get_bridge_cb,
[AST_HTTP_DELETE] = ast_ari_delete_bridge_cb, [AST_HTTP_DELETE] = ast_ari_delete_bridge_cb,
}, },
.num_children = 6, .num_children = 5,
.children = { &bridges_bridgeId_addChannel,&bridges_bridgeId_removeChannel,&bridges_bridgeId_mohStart,&bridges_bridgeId_mohStop,&bridges_bridgeId_play,&bridges_bridgeId_record, } .children = { &bridges_bridgeId_addChannel,&bridges_bridgeId_removeChannel,&bridges_bridgeId_moh,&bridges_bridgeId_play,&bridges_bridgeId_record, }
}; };
/*! \brief REST handler for /api-docs/bridges.{format} */ /*! \brief REST handler for /api-docs/bridges.{format} */
static struct stasis_rest_handlers bridges = { static struct stasis_rest_handlers bridges = {

6
rest-api/api-docs/bridges.json
View File

@@ -199,7 +199,7 @@
] ]
}, },
{ {
"path": "/bridges/{bridgeId}/mohStart", "path": "/bridges/{bridgeId}/moh",
"description": "Play music on hold to a bridge", "description": "Play music on hold to a bridge",
"operations": [ "operations": [
{ {
@@ -239,11 +239,11 @@
] ]
}, },
{ {
"path": "/bridges/{bridgeId}/mohStop", "path": "/bridges/{bridgeId}/moh",
"description": "Stop music on hold for a bridge", "description": "Stop music on hold for a bridge",
"operations": [ "operations": [
{ {
"httpMethod": "POST", "httpMethod": "DELETE",
"summary": "Stop playing music on hold to a bridge.", "summary": "Stop playing music on hold to a bridge.",
"notes": "This will only stop music on hold being played via bridges/{bridgeId}/mohStart.", "notes": "This will only stop music on hold being played via bridges/{bridgeId}/mohStart.",
"nickname": "mohStopBridge", "nickname": "mohStopBridge",