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

make framehooks prevent native bridging (for real this time)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@325545 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2011-06-29 16:18:39 +00:00
parent 3b216f2dc9
commit 0bdbde0690
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main/channel.c
View File

@@ -7287,6 +7287,7 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
(c0->tech->bridge == c1->tech->bridge) && (c0->tech->bridge == c1->tech->bridge) &&
!c0->monitor && !c1->monitor && !c0->monitor && !c1->monitor &&
!c0->audiohooks && !c1->audiohooks && !c0->audiohooks && !c1->audiohooks &&
ast_framehook_list_is_empty(c0->framehooks) && ast_framehook_list_is_empty(c1->framehooks) &&
!c0->masq && !c0->masqr && !c1->masq && !c1->masqr) { !c0->masq && !c0->masqr && !c1->masq && !c1->masqr) {
int timeoutms = to - 1000 > 0 ? to - 1000 : to; int timeoutms = to - 1000 > 0 ? to - 1000 : to;
/* Looks like they share a bridge method and nothing else is in the way */ /* Looks like they share a bridge method and nothing else is in the way */