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 /include/asterisk/stasis_app_impl.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 'include/asterisk/stasis_app_impl.h')
| -rw-r--r-- | include/asterisk/stasis_app_impl.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asterisk/stasis_app_impl.h b/include/asterisk/stasis_app_impl.h index d4b467756..a8c8c0586 100644 --- a/include/asterisk/stasis_app_impl.h +++ b/include/asterisk/stasis_app_impl.h @@ -49,7 +49,7 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc, char *argv[]); /*! Callback type for stasis app commands */ -typedef void *(*stasis_app_command_cb)(struct stasis_app_control *control, +typedef int (*stasis_app_command_cb)(struct stasis_app_control *control, struct ast_channel *chan, void *data); /*! @@ -63,10 +63,11 @@ typedef void *(*stasis_app_command_cb)(struct stasis_app_control *control, * \param control Control object for the channel to send the command to. * \param command Command function to execute. * \param data Optional data to pass along with the control function. - * \return Return value from \a command. - * \return \c NULL on error. + * + * \return zero on success. + * \return error code otherwise. */ -void *stasis_app_send_command(struct stasis_app_control *control, +int stasis_app_send_command(struct stasis_app_control *control, stasis_app_command_cb command, void *data); /*! |