[asterisk-dev] [Code Review] 4382: stasis bridge: handle early hangup of swap channel
rmudgett
reviewboard at asterisk.org
Wed Jan 28 11:47:46 CST 2015
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/4382/#review14346
-----------------------------------------------------------
/branches/13/main/bridge.c
<https://reviewboard.asterisk.org/r/4382/#comment24854>
1) Check that res is zero before push_peek.
2) Lock the bridge to call bridge_find_channel() and push_peek!
3) Blank line between variable declarations and code.
/branches/13/res/stasis/stasis_bridge.c
<https://reviewboard.asterisk.org/r/4382/#comment24856>
It looks like you could move all of the swap channel data gathering from the push to the push_peek call.
Linkedid and accountcode updates
/branches/13/res/stasis/stasis_bridge.c
<https://reviewboard.asterisk.org/r/4382/#comment24855>
Why not use the swap parameter here?
if !swap
swap_control = stasis_app_control_find_by_channel(swap->chan)
- rmudgett
On Jan. 28, 2015, 11:01 a.m., Scott Griepentrog wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/4382/
> -----------------------------------------------------------
>
> (Updated Jan. 28, 2015, 11:01 a.m.)
>
>
> Review request for Asterisk Developers.
>
>
> Bugs: ASTERISK-24649
> https://issues.asterisk.org/jira/browse/ASTERISK-24649
>
>
> Repository: Asterisk
>
>
> Description
> -------
>
> During an attended transfer of a channel in stasis, where a local channel is used to replace (swap in for) a PJSIP channel, there is a race condition. The PJSIP REFER transfer has been initiated (ast_bridge_impart) but will be completed later on another thread (bridge_channel_ind_thread), however, prior to the stasis bridging callback (bridge_stasis_push) being called the PJSIP channel is hungup, which allows the stasis app loop to exit, deleting the stasis control. That prevents the stasis bridge callback from getting the app name from the channel being replaced (swap).
>
> This patch adds a new stasis bridge callback push_peek, which is called from the ast_bridge_impart() thread. This allows the new bridge_stasis_push_peek() function to copy the stasis app name from the originating channel before the PJSIP channel can be hungup.
>
>
> Diffs
> -----
>
> /branches/13/res/stasis/stasis_bridge.c 431296
> /branches/13/main/bridge_channel.c 431296
> /branches/13/main/bridge.c 431296
> /branches/13/include/asterisk/bridge.h 431296
>
> Diff: https://reviewboard.asterisk.org/r/4382/diff/
>
>
> Testing
> -------
>
> Running tests/rest_api/external_interaction/attended_transfer/stasis_bridge_to_stasis_app now does not result in an occasional failure.
>
>
> Thanks,
>
> Scott Griepentrog
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20150128/1b36a42b/attachment-0001.html>
More information about the asterisk-dev
mailing list