mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
ARI: Make mixing bridges propagate linkedids and accountcodes.
* Create a Stasis bridge sub-class to propagate linkedids and accountcodes. * Fixed the basic bridge sub-class to update peeraccount codes when the number of channels in the bridge drops back down to two parties. * Refactored ast_bridge_channel_update_accountcodes() to handle channels joining/leaving the bridge. * Fixed the basic bridge sub-class to not call the base bridge class pull method twice. AFS-105 #close ASTERISK-23852 #close Reported by: Richard Mudgett Review: https://reviewboard.asterisk.org/r/3720/ ........ Merged revisions 418225 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418226 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
108
res/stasis/stasis_bridge.c
Normal file
108
res/stasis/stasis_bridge.c
Normal file
@@ -0,0 +1,108 @@
|
||||
/*
|
||||
* Asterisk -- An open source telephony toolkit.
|
||||
*
|
||||
* Copyright (C) 2014, Digium, Inc.
|
||||
*
|
||||
* Richard Mudgett <rmudgett@digium.com>
|
||||
*
|
||||
* See http://www.asterisk.org for more information about
|
||||
* the Asterisk project. Please do not directly contact
|
||||
* any of the maintainers of this project for assistance;
|
||||
* the project provides a web site, mailing lists and IRC
|
||||
* channels for your use.
|
||||
*
|
||||
* This program is free software, distributed under the terms of
|
||||
* the GNU General Public License Version 2. See the LICENSE file
|
||||
* at the top of the source tree.
|
||||
*/
|
||||
|
||||
/*!
|
||||
* \file
|
||||
* \brief Stasis bridge subclass.
|
||||
*
|
||||
* \author Richard Mudgett <rmudgett@digium.com>
|
||||
*
|
||||
* See Also:
|
||||
* \arg \ref AstCREDITS
|
||||
*/
|
||||
|
||||
|
||||
#include "asterisk.h"
|
||||
|
||||
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||
|
||||
#include "asterisk/bridge.h"
|
||||
#include "asterisk/bridge_internal.h"
|
||||
#include "stasis_bridge.h"
|
||||
|
||||
/* ------------------------------------------------------------------- */
|
||||
|
||||
/*!
|
||||
* \internal
|
||||
* \brief Push this channel into the Stasis bridge.
|
||||
* \since 12.5.0
|
||||
*
|
||||
* \param self Bridge to operate upon.
|
||||
* \param bridge_channel Bridge channel to push.
|
||||
* \param swap Bridge channel to swap places with if not NULL.
|
||||
*
|
||||
* \note On entry, self is already locked.
|
||||
*
|
||||
* \retval 0 on success.
|
||||
* \retval -1 on failure. The channel did not get pushed.
|
||||
*/
|
||||
static int bridge_stasis_push(struct ast_bridge *self, struct ast_bridge_channel *bridge_channel, struct ast_bridge_channel *swap)
|
||||
{
|
||||
if (self->allowed_capabilities & STASIS_BRIDGE_MIXING_CAPABILITIES) {
|
||||
ast_bridge_channel_update_linkedids(bridge_channel, swap);
|
||||
if (ast_test_flag(&self->feature_flags, AST_BRIDGE_FLAG_SMART)) {
|
||||
ast_bridge_channel_update_accountcodes(bridge_channel, swap);
|
||||
}
|
||||
}
|
||||
|
||||
return ast_bridge_base_v_table.push(self, bridge_channel, swap);
|
||||
}
|
||||
|
||||
/*!
|
||||
* \internal
|
||||
* \brief Pull this channel from the Stasis bridge.
|
||||
* \since 12.5.0
|
||||
*
|
||||
* \param self Bridge to operate upon.
|
||||
* \param bridge_channel Bridge channel to pull.
|
||||
*
|
||||
* \note On entry, self is already locked.
|
||||
*
|
||||
* \return Nothing
|
||||
*/
|
||||
static void bridge_stasis_pull(struct ast_bridge *self, struct ast_bridge_channel *bridge_channel)
|
||||
{
|
||||
if ((self->allowed_capabilities & STASIS_BRIDGE_MIXING_CAPABILITIES)
|
||||
&& ast_test_flag(&self->feature_flags, AST_BRIDGE_FLAG_SMART)) {
|
||||
ast_bridge_channel_update_accountcodes(NULL, bridge_channel);
|
||||
}
|
||||
|
||||
ast_bridge_base_v_table.pull(self, bridge_channel);
|
||||
}
|
||||
|
||||
static struct ast_bridge_methods bridge_stasis_v_table;
|
||||
|
||||
struct ast_bridge *bridge_stasis_new(uint32_t capabilities, unsigned int flags, const char *name, const char *id)
|
||||
{
|
||||
void *bridge;
|
||||
|
||||
bridge = bridge_alloc(sizeof(struct ast_bridge), &bridge_stasis_v_table);
|
||||
bridge = bridge_base_init(bridge, capabilities, flags, "Stasis", name, id);
|
||||
bridge = bridge_register(bridge);
|
||||
|
||||
return bridge;
|
||||
}
|
||||
|
||||
void bridge_stasis_init(void)
|
||||
{
|
||||
/* Setup the Stasis bridge subclass v_table. */
|
||||
bridge_stasis_v_table = ast_bridge_base_v_table;
|
||||
bridge_stasis_v_table.name = "stasis";
|
||||
bridge_stasis_v_table.push = bridge_stasis_push;
|
||||
bridge_stasis_v_table.pull = bridge_stasis_pull;
|
||||
}
|
||||
74
res/stasis/stasis_bridge.h
Normal file
74
res/stasis/stasis_bridge.h
Normal file
@@ -0,0 +1,74 @@
|
||||
/*
|
||||
* Asterisk -- An open source telephony toolkit.
|
||||
*
|
||||
* Copyright (C) 2014, Digium, Inc.
|
||||
*
|
||||
* Richard Mudgett <rmudgett@digium.com>
|
||||
*
|
||||
* See http://www.asterisk.org for more information about
|
||||
* the Asterisk project. Please do not directly contact
|
||||
* any of the maintainers of this project for assistance;
|
||||
* the project provides a web site, mailing lists and IRC
|
||||
* channels for your use.
|
||||
*
|
||||
* This program is free software, distributed under the terms of
|
||||
* the GNU General Public License Version 2. See the LICENSE file
|
||||
* at the top of the source tree.
|
||||
*/
|
||||
|
||||
/*!
|
||||
* \file
|
||||
* \brief Internal API for the Stasis bridge subclass.
|
||||
*
|
||||
* \author Richard Mudgett <rmudgett@digium.com>
|
||||
*
|
||||
* See Also:
|
||||
* \arg \ref AstCREDITS
|
||||
*/
|
||||
|
||||
#ifndef _ASTERISK_STASIS_BRIDGE_H
|
||||
#define _ASTERISK_STASIS_BRIDGE_H
|
||||
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* ------------------------------------------------------------------- */
|
||||
|
||||
/*! Normal capabilities of mixing bridges */
|
||||
#define STASIS_BRIDGE_MIXING_CAPABILITIES \
|
||||
(AST_BRIDGE_CAPABILITY_NATIVE \
|
||||
| AST_BRIDGE_CAPABILITY_1TO1MIX \
|
||||
| AST_BRIDGE_CAPABILITY_MULTIMIX)
|
||||
|
||||
/*!
|
||||
* \internal
|
||||
* \brief Create a new Stasis bridge.
|
||||
* \since 12.5.0
|
||||
*
|
||||
* \param capabilities The capabilities that we require to be used on the bridge
|
||||
* \param flags Flags that will alter the behavior of the bridge
|
||||
* \param name Name given to the bridge by Stasis (optional)
|
||||
* \param id Unique ID given to the bridge by Stasis (optional)
|
||||
*
|
||||
* \retval a pointer to a new bridge on success
|
||||
* \retval NULL on failure
|
||||
*/
|
||||
struct ast_bridge *bridge_stasis_new(uint32_t capabilities, unsigned int flags, const char *name, const char *id);
|
||||
|
||||
/*!
|
||||
* \internal
|
||||
* \brief Initialize the Stasis bridge subclass.
|
||||
* \since 12.5.0
|
||||
*
|
||||
* \return Nothing
|
||||
*/
|
||||
void bridge_stasis_init(void);
|
||||
|
||||
/* ------------------------------------------------------------------- */
|
||||
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _ASTERISK_STASIS_BRIDGE_H */
|
||||
Reference in New Issue
Block a user