-
- Downloads
CHANNEL(peer), chan_iax2, res_fax, SNMP agent: Fix deadlock from reaching across a bridge.
Calling ast_channel_bridge_peer() cannot be done while holding any channel locks. The reported issue hit the deadlock in chan_iax2, but an audit of the ast_channel_bridge_peer() calls found three more locations where the same deadlock can occur. * Made CHANNEL(peer), res_fax, and the SNMP agent not call ast_channel_bridge_peer() with any channel locked. For CHANNEL(peer) I had to rework the logic to not hold the channel lock. * Made chan_iax2 no longer call ast_channel_bridge_peer(). It was done for legacy reasons that no longer apply. * Removed the iax.conf forcejitterbuffer option. It is now always enabled when the jitterbuffer option is enabled. If you put a jitter buffer on a channel it will be on the channel. ASTERISK-24600 #close Reported by: Jeff Collell Review: https://reviewboard.asterisk.org/r/4342/ ........ Merged revisions 430817 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@430819 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Showing
- CHANGES 6 additions, 0 deletionsCHANGES
- channels/chan_iax2.c 8 additions, 56 deletionschannels/chan_iax2.c
- configs/samples/iax.conf.sample 0 additions, 7 deletionsconfigs/samples/iax.conf.sample
- funcs/func_channel.c 27 additions, 15 deletionsfuncs/func_channel.c
- res/res_fax.c 5 additions, 1 deletionres/res_fax.c
- res/snmp/agent.c 8 additions, 2 deletionsres/snmp/agent.c
Loading
Please register or sign in to comment