diff options
| author | Mark Spencer <markster@digium.com> | 2004-03-23 00:56:36 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-03-23 00:56:36 +0000 |
| commit | 3107d6d03b56cd8f7db78d04a8ecae0d91f9618a (patch) | |
| tree | 95fbb387f57bbd8bc039939002d07c91f4618857 /channels/chan_iax2.c | |
| parent | 67af82457efe06c7cf6d043ac56db2f8f1ff4d44 (diff) | |
Hold owner lock when changing codecs
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
| -rwxr-xr-x | channels/chan_iax2.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 5b17fa464..404f32ad7 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4948,11 +4948,21 @@ retryowner: iaxs[fr.callno]->owner->nativeformats = iaxs[fr.callno]->peerformat; if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Format for call is %s\n", ast_getformatname(iaxs[fr.callno]->owner->nativeformats)); - /* Setup read/write formats properly. */ - if (iaxs[fr.callno]->owner->writeformat) - ast_set_write_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->writeformat); - if (iaxs[fr.callno]->owner->readformat) - ast_set_read_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->readformat); +retryowner2: + if (ast_mutex_trylock(&iaxs[fr.callno]->owner->lock)) { + ast_mutex_unlock(&iaxsl[fr.callno]); + usleep(1); + ast_mutex_lock(&iaxsl[fr.callno]); + if (iaxs[fr.callno] && iaxs[fr.callno]->owner) goto retryowner2; + } + + if (iaxs[fr.callno] && iaxs[fr.callno]->owner) { + /* Setup read/write formats properly. */ + if (iaxs[fr.callno]->owner->writeformat) + ast_set_write_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->writeformat); + if (iaxs[fr.callno]->owner->readformat) + ast_set_read_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->readformat); + } } } ast_mutex_lock(&dpcache_lock); |