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.h | |
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.h')
-rw-r--r-- | res/stasis/command.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/res/stasis/command.h b/res/stasis/command.h index 21f4df0c0..a99d40d0a 100644 --- a/res/stasis/command.h +++ b/res/stasis/command.h @@ -34,9 +34,11 @@ struct stasis_app_command; struct stasis_app_command *command_create( stasis_app_command_cb callback, void *data); +void command_complete(struct stasis_app_command *command, int retval); + void command_invoke(struct stasis_app_command *command, struct stasis_app_control *control, struct ast_channel *chan); -void *command_join(struct stasis_app_command *command); +int command_join(struct stasis_app_command *command); #endif /* _ASTERISK_RES_STASIS_CONTROL_H */ |