[Asterisk-code-review] stasis/control: Fix possible deadlock with swap channel (asterisk[14])
George Joseph
asteriskteam at digium.com
Wed Sep 6 06:49:25 CDT 2017
Hello Jenkins2,
I'd like you to reexamine a change. Please visit
https://gerrit.asterisk.org/6367
to look at the new patch set (#3).
Change subject: stasis/control: Fix possible deadlock with swap channel
......................................................................
stasis/control: Fix possible deadlock with swap channel
If an error occurs during a bridge impart it's possible that
the "bridge_after" callback might try to run before
control_swap_channel_in_bridge has been signalled to continue.
Since control_swap_channel_in_bridge is holding the control lock
and the callback needs it, a deadlock will occur.
* control_swap_channel_in_bridge now only holds the control
lock while it's actually modifying the control structure and
releases it while the bridge impart is running.
* bridge_after_cb is now tolerant of impart failures.
Change-Id: Ifd239aa93955b3eb475521f61e284fcb0da2c3b3
---
M include/asterisk/bridge_after.h
M main/bridge.c
M main/bridge_after.c
M res/stasis/control.c
4 files changed, 97 insertions(+), 55 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/67/6367/3
--
To view, visit https://gerrit.asterisk.org/6367
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: 14
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ifd239aa93955b3eb475521f61e284fcb0da2c3b3
Gerrit-Change-Number: 6367
Gerrit-PatchSet: 3
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20170906/6a1d66b1/attachment-0001.html>
More information about the asterisk-code-review
mailing list