diff options
author | Matthew Jordan <mjordan@digium.com> | 2014-06-08 18:12:53 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2014-06-08 18:12:53 +0000 |
commit | 20a14e568f64de25326d794768790351cb703330 (patch) | |
tree | 045cdcd6e32ce2c69d1a71f317864519a78e6349 /main/channel.c | |
parent | 30b7ba05e737054e0119c4d0c2bb5498ab645705 (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/channel.c')
-rw-r--r-- | main/channel.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 2d84c771d..27e07b800 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2596,7 +2596,7 @@ void ast_channel_clear_softhangup(struct ast_channel *chan, int flag) /*! \brief Softly hangup a channel, don't lock */ int ast_softhangup_nolock(struct ast_channel *chan, int cause) { - ast_debug(1, "Soft-Hanging up channel '%s'\n", ast_channel_name(chan)); + ast_debug(1, "Soft-Hanging (%#04x) up channel '%s'\n", cause, ast_channel_name(chan)); /* Inform channel driver that we need to be hung up, if it cares */ ast_channel_softhangup_internal_flag_add(chan, cause); ast_queue_frame(chan, &ast_null_frame); @@ -10146,6 +10146,18 @@ int ast_channel_is_bridged(const struct ast_channel *chan) return ast_channel_internal_bridge(chan) != NULL; } +int ast_channel_is_leaving_bridge(struct ast_channel *chan) +{ + int hangup_flags = ast_channel_softhangup_internal_flag(chan); + int hangup_test = hangup_flags & (AST_SOFTHANGUP_ASYNCGOTO | AST_SOFTHANGUP_UNBRIDGE); + + /* This function should only return true if either ASYNCGOTO + * or UNBRIDGE is set, or both flags are set. It should return + * false if any other flag is set. + */ + return (hangup_test && (hangup_test == hangup_flags)); +} + struct ast_channel *ast_channel_bridge_peer(struct ast_channel *chan) { struct ast_channel *peer; |