kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hold owner lock when changing codecs

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-03-23 00:56:36 +00:00
parent 67af82457e
commit 3107d6d03b
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
channels/chan_iax2.c
View File

@@ -4948,11 +4948,21 @@ retryowner:
iaxs[fr.callno]->owner->nativeformats = iaxs[fr.callno]->peerformat; iaxs[fr.callno]->owner->nativeformats = iaxs[fr.callno]->peerformat;
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Format for call is %s\n", ast_getformatname(iaxs[fr.callno]->owner->nativeformats)); ast_verbose(VERBOSE_PREFIX_3 "Format for call is %s\n", ast_getformatname(iaxs[fr.callno]->owner->nativeformats));
/* Setup read/write formats properly. */ retryowner2:
if (iaxs[fr.callno]->owner->writeformat) if (ast_mutex_trylock(&iaxs[fr.callno]->owner->lock)) {
ast_set_write_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->writeformat); ast_mutex_unlock(&iaxsl[fr.callno]);
if (iaxs[fr.callno]->owner->readformat) usleep(1);
ast_set_read_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->readformat); 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); ast_mutex_lock(&dpcache_lock);