diff options
| author | Jonathan Rose <jrose@digium.com> | 2014-08-13 16:24:37 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2014-08-13 16:24:37 +0000 |
| commit | d4695774e7ef3b4699b8283f175d161cd19e3d25 (patch) | |
| tree | 4f59a5f5dc0094ffbe928dd21b6095defa056832 /main/framehook.c | |
| parent | 6a6702bb0fff957c0264e872fe0760efe21a1e20 (diff) | |
Bridges: Fix feature interruption/unintended kick caused by external actions
If a manager or CLI user attached a mixmonitor to a call running a dynamic
bridge feature while in a bridge, the feature would be interrupted and the
channel would be forcibly kicked out of the bridge (usually ending the call
during a simple 1 to 1 call). This would also occur during any similar action
that could set the unbridge soft hangup flag, so the fix for this was to
remove unbridge from the soft hangup flags and make it a separate thing all
together.
ASTERISK-24027 #close
Reported by: mjordan
Review: https://reviewboard.asterisk.org/r/3900/
........
Merged revisions 420934 from http://svn.asterisk.org/svn/asterisk/branches/12
........
Merged revisions 420940 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@420947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/framehook.c')
| -rw-r--r-- | main/framehook.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/framehook.c b/main/framehook.c index 0d42b4990..ec4e1695f 100644 --- a/main/framehook.c +++ b/main/framehook.c @@ -170,7 +170,7 @@ int ast_framehook_attach(struct ast_channel *chan, struct ast_framehook_interfac } if (ast_channel_is_bridged(chan)) { - ast_softhangup_nolock(chan, AST_SOFTHANGUP_UNBRIDGE); + ast_channel_set_unbridged_nolock(chan, 1); } return framehook->id; @@ -199,7 +199,7 @@ int ast_framehook_detach(struct ast_channel *chan, int id) AST_LIST_TRAVERSE_SAFE_END; if (ast_channel_is_bridged(chan)) { - ast_softhangup_nolock(chan, AST_SOFTHANGUP_UNBRIDGE); + ast_channel_set_unbridged_nolock(chan, 1); } return res; |