kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-05 20:55:26 +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

64
include/asterisk/stasis_app.h
View File

@@ -277,6 +277,60 @@ enum stasis_app_subscribe_res stasis_app_unsubscribe(const char *app_name,
/*! \brief Handler for controlling a channel that's in a Stasis application */
struct stasis_app_control;
/*! \brief Rule to check to see if an operation is allowed */
struct stasis_app_control_rule {
/*!
* \brief Checks to see if an operation is allowed on the control
*
* \param control Control object to check
* \return 0 on success, otherwise a failure code
*/
enum stasis_app_control_channel_result (*check_rule)(
const struct stasis_app_control *control);
/*! Next item in the list */
AST_LIST_ENTRY(stasis_app_control_rule) next;
};
/*!
* \brief Registers an add channel to bridge rule.
*
* \param control Control object
* \param rule The rule to register
*/
void stasis_app_control_register_add_rule(
struct stasis_app_control *control,
struct stasis_app_control_rule *rule);
/*!
* \brief UnRegister an add channel to bridge rule.
*
* \param control Control object
* \param rule The rule to unregister
*/
void stasis_app_control_unregister_add_rule(
struct stasis_app_control *control,
struct stasis_app_control_rule *rule);
/*!
* \brief Registers a remove channel from bridge rule.
*
* \param control Control object
* \param rule The rule to register
*/
void stasis_app_control_register_remove_rule(
struct stasis_app_control *control,
struct stasis_app_control_rule *rule);
/*!
* \brief Unregisters a remove channel from bridge rule.
*
* \param control Control object
* \param rule The rule to unregister
*/
void stasis_app_control_unregister_remove_rule(
struct stasis_app_control *control,
struct stasis_app_control_rule *rule);
/*!
* \brief Returns the handler for the given channel.
* \param chan Channel to handle.
@@ -581,6 +635,16 @@ struct ast_channel *stasis_app_bridge_moh_channel(
int stasis_app_bridge_moh_stop(
struct ast_bridge *bridge);
/*!
* \brief Result codes used when adding/removing channels to/from bridges.
*/
enum stasis_app_control_channel_result {
/*! The channel is okay to be added/removed */
STASIS_APP_CHANNEL_OKAY = 0,
/*! The channel is currently recording */
STASIS_APP_CHANNEL_RECORDING
};
/*!
* \brief Add a channel to the bridge.
*