kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

audiohooks: Reevaluate the bridge technology when an audiohook is added or removed.

Browse Source 
Adding a mixmonitor to a channel causes the bridge to change technologies
from native to simple_bridge so the call can be recorded.  However, when
the mixmonitor is stopped the bridge does not switch back to the native
technology.

* Added unbridge requests to reevaluate the bridge when a channel
audiohook is removed.

* Moved the unbridge request into ast_audiohook_attach() ensure that the
bridge reevaluates whenever an audiohook is attached.  This simplified the
mixmonitor and chan_spy start code as well.

* Added defensive code to stop_mixmonitor_full() in case additional
arguments are ever added to the StopMixMonitor application.

* Made ast_framehook_detach() not do an unbridge request if the framehook
does not exist.

* Made ast_framehook_list_fixup() do an unbridge request if there are any
framehooks.  Also simplified the loop.

ASTERISK-24195 #close
Reported by: Jonathan Rose

Review: https://reviewboard.asterisk.org/r/4046/
........

Merged revisions 424506 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 424507 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@424508 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-10-03 19:42:54 +00:00
parent cc11a78869
commit 70301b0438
4 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/app_mixmonitor.c
View File

@@ -451,22 +451,11 @@ static void destroy_monitor_audiohook(struct mixmonitor *mixmonitor)
static int startmon(struct ast_channel *chan, struct ast_audiohook *audiohook)
{
int res = 0;
if (!chan)
if (!chan) {
return -1;
ast_audiohook_attach(chan, audiohook);
if (!res) {
ast_channel_lock(chan);
if (ast_channel_is_bridged(chan)) {
ast_channel_set_unbridged_nolock(chan, 1);
}
ast_channel_unlock(chan);
}
return res;
return ast_audiohook_attach(chan, audiohook);
}
/*!
@@ -1149,7 +1138,8 @@ static int stop_mixmonitor_full(struct ast_channel *chan, const char *data)
ast_channel_lock(chan);
datastore = ast_channel_datastore_find(chan, &mixmonitor_ds_info, args.mixmonid);
datastore = ast_channel_datastore_find(chan, &mixmonitor_ds_info,
S_OR(args.mixmonid, NULL));
if (!datastore) {
ast_channel_unlock(chan);
return -1;