diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-10-22 17:06:21 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-10-22 17:06:21 +0000 |
| commit | d5db1f76f84f485bb0854b1ed986a04edf72e4c6 (patch) | |
| tree | 4416c04acc96e89325c994a07965d4abf3e3327e /include | |
| parent | 8f03a463e1e04384fc8d5609d318566de2c7437b (diff) | |
Bridging: Fix orphaned bridge if neither of the joining channels can join.
The original issue noted that the bridge is orphaned when res_parking.so
is not loaded and a call uses the dial kK flags.
A similar issue happens when only one of the park flags is used. In this
case you have the bridge with one or the other channel left in it. The
channel and bridge will stay around until the channel hangs up.
* Fixed the initial bridge channel push failure to act as if the channel
were kicked out of the bridge. The bridge then decides if it needs to be
dissolved.
(closes issue ASTERISK-22629)
Reported by: Kevin Harwell
Review: https://reviewboard.asterisk.org/r/2928/
........
Merged revisions 401424 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401425 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/bridge_channel_internal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asterisk/bridge_channel_internal.h b/include/asterisk/bridge_channel_internal.h index 09a447d61..b5a3a8de2 100644 --- a/include/asterisk/bridge_channel_internal.h +++ b/include/asterisk/bridge_channel_internal.h @@ -107,6 +107,9 @@ void bridge_channel_settle_owed_events(struct ast_bridge *orig_bridge, struct as * * \retval 0 on success. * \retval -1 on failure. The channel did not get pushed. + * + * \note On failure the caller must call + * ast_bridge_features_remove(bridge_channel->features, AST_BRIDGE_HOOK_REMOVE_ON_PULL); */ int bridge_channel_internal_push(struct ast_bridge_channel *bridge_channel); |