]> git.ipfire.org Git - thirdparty/asterisk.git/commit
res_stasis: Handle re-enter stasis bridge with swap channel. 70/2670/1
authorRichard Mudgett <rmudgett@digium.com>
Fri, 15 Apr 2016 19:36:59 +0000 (14:36 -0500)
committerRichard Mudgett <rmudgett@digium.com>
Wed, 20 Apr 2016 21:52:41 +0000 (16:52 -0500)
commitc2158c01c2624f5711a0c9e1a36f68f602b1aa31
tree31080fe378d956d3af0a61e23d3cb89929cf7ca8
parent4bdc54f66c1d7f6ffdd00e956ac94182d413a569
res_stasis: Handle re-enter stasis bridge with swap channel.

We lose the fact that there is a swap channel if there is one.  We
currently wind up rejoining the stasis bridge as a normal join after the
swap channel has already been kicked from the bridge.

This patch preserves the swap channel so the AMI/ARI events can note that
the channel joining the bridge is swapping with another channel.  Another
benefit to swaqpping in one operation is if there are any channels that
get lonely (MOH, bridge playback, and bridge record channels).  The lonely
channels won't leave before the joining channel has a chance to come back
in under stasis if the swap channel is the only reason the lonely channels
are staying in the bridge.

ASTERISK-25947 #close
Reported by: Richard Mudgett

ASTERISK-24649
Reported by: John Bigelow

ASTERISK-24782
Reported by: John Bigelow

Change-Id: If37ea508831d1fed6dbfac2f191c638fc0a850ee
res/stasis/control.c
res/stasis/control.h
res/stasis/stasis_bridge.c