kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARI: Adding a channel to a bridge while a live recording is active blocks

Browse Source 
Added the ability to have rules that are checked when adding and/or removing
channels to/from a bridge.  In this case, if a channel is currently recording
and someone attempts to add it to a bridge an "is recording" rule is checked,
fails, and a 409 conflict is returned.

Also command functions now return an integer value that can be descriptive of
what kind of problems, if any, occurred before or during execution.

(closes issue ASTERISK-22624)
Reported by: Joshua Colp
Review: https://reviewboard.asterisk.org/r/2947/
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403750 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin Harwell
2013-12-13 16:38:57 +00:00
parent fc8c0ef28f
commit ce18946de4
11 changed files with 346 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
res/ari/resource_bridges.c
View File

@@ -172,6 +172,22 @@ static struct control_list *control_list_create(struct ast_ari_response *respons
return list;
}
static int check_add_remove_channel(struct ast_ari_response *response,
struct stasis_app_control *control,
enum stasis_app_control_channel_result result)
{
switch (result) {
case STASIS_APP_CHANNEL_RECORDING :
ast_ari_response_error(
response, 409, "Conflict", "Channel %s currently recording",
stasis_app_control_get_channel_id(control));
return -1;
case STASIS_APP_CHANNEL_OKAY:
return 0;
}
return 0;
}
void ast_ari_bridges_add_channel(struct ast_variable *headers,
struct ast_ari_bridges_add_channel_args *args,
struct ast_ari_response *response)
@@ -179,6 +195,7 @@ void ast_ari_bridges_add_channel(struct ast_variable *headers,
RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup);
RAII_VAR(struct control_list *, list, NULL, ao2_cleanup);
size_t i;
int has_error = 0;
if (!bridge) {
/* Response filled in by find_bridge() */
@@ -202,10 +219,16 @@ void ast_ari_bridges_add_channel(struct ast_variable *headers,
}
for (i = 0; i < list->count; ++i) {
stasis_app_control_add_channel_to_bridge(list->controls[i], bridge);
if ((has_error = check_add_remove_channel(response, list->controls[i],
stasis_app_control_add_channel_to_bridge(
list->controls[i], bridge)))) {
break;
}
}
ast_ari_response_no_content(response);
if (!has_error) {
ast_ari_response_no_content(response);
}
}
void ast_ari_bridges_remove_channel(struct ast_variable *headers,