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/pbx.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/pbx.c')
-rw-r--r-- | main/pbx.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/main/pbx.c b/main/pbx.c index 785175fc4..d814c5ac6 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -6363,11 +6363,6 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c, S_COR(ast_channel_caller(c)->id.number.valid, ast_channel_caller(c)->id.number.str, NULL), &found, 1))) { - /* Defensively clear the UNBRIDGE flag in case it leaked - * out of the bridging framework. UNBRIDE never implies - * that a channel is hung up. - */ - ast_channel_clear_softhangup(c, AST_SOFTHANGUP_UNBRIDGE); if (!ast_check_hangup(c)) { ast_channel_priority_set(c, ast_channel_priority(c) + 1); continue; |