kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract a useful routine from the softmix bridge technology.

Browse Source 
* Extract a useful routine from the softmix bridge technology for other
technologies.  Make other technologies use it if they can.

* Made native and 1-1 bridges write to all parties if the bridge channel
writing the frame into the bridge is NULL.  Softmix will also do the same
for frame types that make sense.

* Tweak the bridge write routine return value meaning and adjust the
bridge technologies to match.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392514 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-06-21 22:39:27 +00:00
parent c14cdede12
commit 1267c91315
7 changed files with 69 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bridges/bridge_holding.c
View File

@@ -255,27 +255,25 @@ static void holding_bridge_leave(struct ast_bridge *bridge, struct ast_bridge_ch
static int holding_bridge_write(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, struct ast_frame *frame)
{
struct ast_bridge_channel *cur;
struct holding_channel *hc = bridge_channel->tech_pvt;
struct holding_channel *hc = bridge_channel ? bridge_channel->tech_pvt : NULL;
/* If there is no tech_pvt, then the channel failed to allocate one when it joined and is borked. Don't listen to him. */
if (!hc) {
return -1;
/* "Accept" the frame and discard it. */
return 0;
}
/* If we aren't an announcer, we never have any business writing anything. */
if (!ast_test_flag(&hc->holding_roles, HOLDING_ROLE_ANNOUNCER)) {
return -1;
/* "Accept" the frame and discard it. */
return 0;
}
/* Ok, so we are the announcer and there are one or more people available to receive our writes. Let's do it. */
AST_LIST_TRAVERSE(&bridge->channels, cur, entry) {
if (bridge_channel == cur || !cur->tech_pvt) {
continue;
}
ast_bridge_channel_queue_frame(cur, frame);
}
/*
* Ok, so we are the announcer. Write the frame to all other
* channels if any.
*/
ast_bridge_queue_everyone_else(bridge, bridge_channel, frame);
return 0;
}