summaryrefslogtreecommitdiff
path: root/main/framehook.c
diff options
context:
space:
mode:
authorMatthew Jordan <mjordan@digium.com>2014-06-08 18:12:53 +0000
committerMatthew Jordan <mjordan@digium.com>2014-06-08 18:12:53 +0000
commit20a14e568f64de25326d794768790351cb703330 (patch)
tree045cdcd6e32ce2c69d1a71f317864519a78e6349 /main/framehook.c
parent30b7ba05e737054e0119c4d0c2bb5498ab645705 (diff)
bridges/bridge_native_rtp: Reconfigure bridge on removal of framehook
This patch is a re-do of r414122. When r414122 was merged, a major problem with it was uncovered. UNBRIDGE soft hangup flags have a catastrophic effect on the pbx core if they leak out from the bridge layer: the channel gets hung up. With the number of threads involved in a blind transfer, and with the initial patch, it was likely that this would occur. This caused a large number of test failures This patch is nearly identical with the one proposed in r414122, save for the following changes: - We explicitly clear the UNBRIDGE flag when setting an after goto on a channel in a bridge - Defensively, if we encounter an UNBRIDGE flag in the pbx core, we handle it https://reviewboard.asterisk.org/r/3585/ ........ Merged revisions 415443 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@415444 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/framehook.c')
-rw-r--r--main/framehook.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/main/framehook.c b/main/framehook.c
index de8c612aa..84719ef49 100644
--- a/main/framehook.c
+++ b/main/framehook.c
@@ -189,6 +189,10 @@ 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);
+ }
+
return res;
}