diff options
author | Kevin Harwell <kharwell@digium.com> | 2013-12-13 16:38:57 +0000 |
---|---|---|
committer | Kevin Harwell <kharwell@digium.com> | 2013-12-13 16:38:57 +0000 |
commit | ce18946de46a6f16463391a9c07af02b8ee4e925 (patch) | |
tree | 3679fcee389fa7725b00389e6bd7f99cf058bb2e /res/stasis/command.c | |
parent | fc8c0ef28f669a53bcab3a862b4ef71b33665b2e (diff) |
ARI: Adding a channel to a bridge while a live recording is active blocks
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
Diffstat (limited to 'res/stasis/command.c')
-rw-r--r-- | res/stasis/command.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/stasis/command.c b/res/stasis/command.c index f1f7f8f3b..a9e53af12 100644 --- a/res/stasis/command.c +++ b/res/stasis/command.c @@ -37,7 +37,7 @@ struct stasis_app_command { ast_cond_t condition; stasis_app_command_cb callback; void *data; - void *retval; + int retval; int is_done:1; }; @@ -67,7 +67,7 @@ struct stasis_app_command *command_create( return command; } -static void command_complete(struct stasis_app_command *command, void *retval) +void command_complete(struct stasis_app_command *command, int retval) { SCOPED_MUTEX(lock, &command->lock); @@ -76,7 +76,7 @@ static void command_complete(struct stasis_app_command *command, void *retval) ast_cond_signal(&command->condition); } -void *command_join(struct stasis_app_command *command) +int command_join(struct stasis_app_command *command) { SCOPED_MUTEX(lock, &command->lock); while (!command->is_done) { @@ -89,7 +89,7 @@ void *command_join(struct stasis_app_command *command) void command_invoke(struct stasis_app_command *command, struct stasis_app_control *control, struct ast_channel *chan) { - void *retval = command->callback(control, chan, command->data); + int retval = command->callback(control, chan, command->data); command_complete(command, retval); } |