kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@424507 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-10-03 19:39:49 +00:00
parent 6a844be566
commit cff192429b
4 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/framehook.c
View File

@@ -94,7 +94,7 @@ static struct ast_frame *framehook_list_push_event(struct ast_framehook_list *fr
}
skip_size = sizeof(int) * framehooks->count;
skip = alloca(skip_size);
skip = ast_alloca(skip_size);
memset(skip, 0, skip_size);
do {
@@ -198,7 +198,7 @@ int ast_framehook_detach(struct ast_channel *chan, int id)
}
AST_LIST_TRAVERSE_SAFE_END;
if (ast_channel_is_bridged(chan)) {
if (!res && ast_channel_is_bridged(chan)) {
ast_channel_set_unbridged_nolock(chan, 1);
}
@@ -246,9 +246,11 @@ void ast_framehook_list_fixup(struct ast_channel *old_chan, struct ast_channel *
return;
}
AST_LIST_TRAVERSE_SAFE_BEGIN(&ast_channel_framehooks(old_chan)->list, framehook, list) {
AST_LIST_REMOVE_CURRENT(list);
if (!AST_LIST_EMPTY(&ast_channel_framehooks(old_chan)->list)
&& ast_channel_is_bridged(old_chan)) {
ast_channel_set_unbridged_nolock(old_chan, 1);
}
while ((framehook = AST_LIST_REMOVE_HEAD(&ast_channel_framehooks(old_chan)->list, list))) {
/* If inheritance is not allowed for this framehook, just destroy it. */
if (framehook->i.disable_inheritance) {
framehook_detach(framehook, FRAMEHOOK_DETACH_DESTROY);
@@ -257,7 +259,6 @@ void ast_framehook_list_fixup(struct ast_channel *old_chan, struct ast_channel *
/* Otherwise move it to the other channel and perform any fixups set by the framehook interface */
moved_framehook_id = ast_framehook_attach(new_chan, &framehook->i);
if (moved_framehook_id < 0) {
ast_log(LOG_WARNING, "Failed framehook copy during masquerade. Expect loss of features.\n");
framehook_detach(framehook, FRAMEHOOK_DETACH_DESTROY);
@@ -270,7 +271,6 @@ void ast_framehook_list_fixup(struct ast_channel *old_chan, struct ast_channel *
framehook_detach(framehook, FRAMEHOOK_DETACH_PRESERVE);
}
}
AST_LIST_TRAVERSE_SAFE_END;
}
int ast_framehook_list_is_empty(struct ast_framehook_list *framehooks)