diff options
author | Richard Mudgett <rmudgett@digium.com> | 2013-10-18 16:59:09 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2013-10-18 16:59:09 +0000 |
commit | 057d105c5ab47f132036a6f54c1dae636a9442bd (patch) | |
tree | 86bd866ada21eed73dd8228778c0c512ef742e46 /bootstrap.sh | |
parent | 7352433be57a41ddf0627cc9cdd4ed386053238a (diff) |
Add channel lock protection around translation path setup.
Most callers of ast_channel_make_compatible() happen before the channels
enter a two party bridge. With the new bridging framework, two party
bridging technologies may also call ast_channel_make_compatible() when
there is more than one thread involved with the two channels.
* Added channel lock protection in set_format() and
ast_channel_make_compatible_helper() when dealing with the channel's
native formats while setting up a translation path.
* Fixed best_src_fmt and best_dst_fmt usage consistency in
ast_channel_make_compatible_helper(). The call to
ast_translator_best_choice() got them backwards.
* Updated some callers of ast_channel_make_compatible() and the function
documentation. There is actually a difference between the two channels
passed in.
* Fixed the deadlock potential in res_fax.c dealing with
ast_channel_make_compatible(). The deadlock potential was already there
anyway because res_fax called ast_channel_make_compatible() with chan
locked.
(closes issue ASTERISK-22542)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2915/
........
Merged revisions 401239 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401240 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bootstrap.sh')
0 files changed, 0 insertions, 0 deletions