diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2015-01-20 16:46:16 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2015-01-20 16:46:16 +0000 |
| commit | 6af6a216a1fcfb1dcefbfa6dc657d3781f3a24d9 (patch) | |
| tree | 19b0d1bba2257ce3f7acf523dba76c14fa3c6a7c /configs | |
| parent | 072db5e1b9201b3d7219a12ed559a9e856d535b6 (diff) | |
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/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@430817 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/samples/iax.conf.sample | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/configs/samples/iax.conf.sample b/configs/samples/iax.conf.sample index e17c7dfeb..1d9623afb 100644 --- a/configs/samples/iax.conf.sample +++ b/configs/samples/iax.conf.sample @@ -170,12 +170,6 @@ disallow=lpc10 ; jitterbuffer=yes|no: global default as to whether you want ; the jitter buffer at all. ; -; forcejitterbuffer=yes|no: in the ideal world, when we bridge VoIP channels -; we don't want to do jitterbuffering on the switch, since the endpoints -; can each handle this. However, some endpoints may have poor jitterbuffers -; themselves, so this option will force * to always jitterbuffer, even in this -; case. -; ; maxjitterbuffer: a maximum size for the jitter buffer. ; Setting a reasonable maximum here will prevent the call delay ; from rising to silly values in extreme situations; you'll hear @@ -202,7 +196,6 @@ disallow=lpc10 ; jitterbuffer=no -forcejitterbuffer=no ;maxjitterbuffer=1000 ;maxjitterinterps=10 ;resyncthreshold=1000 |