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

Undoing framehook support. Issues were uncovered by Bamboo.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413668 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2014-05-11 01:09:06 +00:00
parent 3b3e4b9b95
commit e2ed86e4ca
6 changed files with 87 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
main/framehook.c
View File

@@ -160,10 +160,6 @@ int ast_framehook_attach(struct ast_channel *chan, struct ast_framehook_interfac
ast_frfree(frame);
}
if (ast_channel_is_bridged(chan)) {
ast_softhangup_nolock(chan, AST_SOFTHANGUP_UNBRIDGE);
}
return framehook->id;
}
@@ -189,10 +185,6 @@ int ast_framehook_detach(struct ast_channel *chan, int id)
}
AST_LIST_TRAVERSE_SAFE_END;
if (!res && ast_channel_is_bridged(chan)) {
ast_softhangup_nolock(chan, AST_SOFTHANGUP_UNBRIDGE);
}
return res;
}
@@ -222,12 +214,6 @@ int ast_framehook_list_is_empty(struct ast_framehook_list *framehooks)
}
int ast_framehook_list_contains_no_active(struct ast_framehook_list *framehooks)
{
return ast_framehook_list_contains_no_active_of_type(framehooks, 0);
}
int ast_framehook_list_contains_no_active_of_type(struct ast_framehook_list *framehooks,
enum ast_frame_type type)
{
struct ast_framehook *cur;
@@ -243,9 +229,6 @@ int ast_framehook_list_contains_no_active_of_type(struct ast_framehook_list *fra
if (cur->detach_and_destroy_me) {
continue;
}
if (type && cur->i.consume_cb && !cur->i.consume_cb(cur->i.data, type)) {
continue;
}
return 0;
}