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

Channels: Masquerades to automatically move frame/audio hooks

Browse Source 
Whenever possible, audiohooks and framehooks will now be copied over
to the channel that the masquerading channel gets cloned into. This
should occur for all audiohooks and most framehooks. As a result,
in Asterisk 12.5 and up, the AUDIOHOOK_INHERIT function is now
deprecated and its behavior is essentially the new default for all
audiohooks, plus some additional audiohooks/framehooks.

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

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418936 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2014-07-18 16:28:10 +00:00
parent 5c988cc4e6
commit af4cd65143
12 changed files with 217 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
main/framehook.c
View File

@@ -56,7 +56,16 @@ struct ast_framehook_list {
AST_LIST_HEAD_NOLOCK(, ast_framehook) list;
};
static void framehook_detach_and_destroy(struct ast_framehook *framehook)
enum framehook_detachment_mode
{
/*! Destroy the framehook outright. */
FRAMEHOOK_DETACH_DESTROY = 0,
/*! Remove the framehook from the channel, but don't destroy the data since
* it will be used by a replacement framehook on another channel. */
FRAMEHOOK_DETACH_PRESERVE,
};
static void framehook_detach(struct ast_framehook *framehook, enum framehook_detachment_mode mode)
{
struct ast_frame *frame;
frame = framehook->i.event_cb(framehook->chan, NULL, AST_FRAMEHOOK_EVENT_DETACHED, framehook->i.data);
@@ -67,7 +76,7 @@ static void framehook_detach_and_destroy(struct ast_framehook *framehook)
}
framehook->chan = NULL;
if (framehook->i.destroy_cb) {
if (mode == FRAMEHOOK_DETACH_DESTROY && framehook->i.destroy_cb) {
framehook->i.destroy_cb(framehook->i.data);
}
ast_free(framehook);
@@ -96,7 +105,7 @@ static struct ast_frame *framehook_list_push_event(struct ast_framehook_list *fr
if (framehook->detach_and_destroy_me) {
/* this guy is signaled for destruction */
AST_LIST_REMOVE_CURRENT(list);
framehook_detach_and_destroy(framehook);
framehook_detach(framehook, FRAMEHOOK_DETACH_DESTROY);
continue;
}
@@ -205,7 +214,7 @@ int ast_framehook_list_destroy(struct ast_channel *chan)
}
AST_LIST_TRAVERSE_SAFE_BEGIN(&ast_channel_framehooks(chan)->list, framehook, list) {
AST_LIST_REMOVE_CURRENT(list);
framehook_detach_and_destroy(framehook);
framehook_detach(framehook, FRAMEHOOK_DETACH_DESTROY);
}
AST_LIST_TRAVERSE_SAFE_END;
ast_free(ast_channel_framehooks(chan));
@@ -213,6 +222,42 @@ int ast_framehook_list_destroy(struct ast_channel *chan)
return 0;
}
void ast_framehook_list_fixup(struct ast_channel *old_chan, struct ast_channel *new_chan)
{
struct ast_framehook *framehook;
int moved_framehook_id;
if (!ast_channel_framehooks(old_chan)) {
return;
}
AST_LIST_TRAVERSE_SAFE_BEGIN(&ast_channel_framehooks(old_chan)->list, framehook, list) {
AST_LIST_REMOVE_CURRENT(list);
/* If inheritance is not allowed for this framehook, just destroy it. */
if (framehook->i.disable_inheritance) {
framehook_detach(framehook, FRAMEHOOK_DETACH_DESTROY);
continue;
}
/* 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);
} else {
if (framehook->i.chan_fixup_cb) {
framehook->i.chan_fixup_cb(framehook->i.data, moved_framehook_id,
old_chan, new_chan);
}
framehook_detach(framehook, FRAMEHOOK_DETACH_PRESERVE);
}
}
AST_LIST_TRAVERSE_SAFE_END;
}
int ast_framehook_list_is_empty(struct ast_framehook_list *framehooks)
{
if (!framehooks) {