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

More read/write lock fixes in various modules

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2574 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
James Golovich
2004-03-27 07:41:33 +00:00
parent 9fca20acc1
commit 6ce8fc0b15
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app_rpt.c
View File

@@ -378,8 +378,8 @@ pthread_attr_t attr;
myrpt->rxchannel = ast_request(myrpt->rxchanname,AST_FORMAT_SLINEAR,tele);
if (myrpt->rxchannel)
{
ast_set_read_format(myrpt->rxchannel,AST_FORMAT_SLINEAR);
ast_set_write_format(myrpt->rxchannel,AST_FORMAT_SLINEAR);
ast_set_read_format(myrpt->rxchannel,AST_FORMAT_SLINEAR, 0);
ast_set_write_format(myrpt->rxchannel,AST_FORMAT_SLINEAR, 0);
myrpt->rxchannel->whentohangup = 0;
myrpt->rxchannel->appl = "Apprpt";
myrpt->rxchannel->data = "(Repeater Rx)";
@@ -405,8 +405,8 @@ pthread_attr_t attr;
myrpt->txchannel = ast_request(myrpt->txchanname,AST_FORMAT_SLINEAR,tele);
if (myrpt->txchannel)
{
ast_set_read_format(myrpt->txchannel,AST_FORMAT_SLINEAR);
ast_set_write_format(myrpt->txchannel,AST_FORMAT_SLINEAR);
ast_set_read_format(myrpt->txchannel,AST_FORMAT_SLINEAR, 0);
ast_set_write_format(myrpt->txchannel,AST_FORMAT_SLINEAR, 0);
myrpt->txchannel->whentohangup = 0;
myrpt->txchannel->appl = "Apprpt";
myrpt->txchannel->data = "(Repeater Rx)";

4
channels/chan_h323.c
View File

@@ -527,8 +527,8 @@ static struct ast_frame *oh323_rtp_read(struct oh323_pvt *p)
if (f->subclass != p->owner->nativeformats) {
ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass);
p->owner->nativeformats = f->subclass;
ast_set_read_format(p->owner, p->owner->readformat);
ast_set_write_format(p->owner, p->owner->writeformat);
ast_set_read_format(p->owner, p->owner->readformat, 0);
ast_set_write_format(p->owner, p->owner->writeformat, 0);
}
/* Do in-band DTMF detection */

6
channels/chan_iax.c
View File

@@ -3798,7 +3798,7 @@ retryowner:
orignative = iaxs[fr.callno]->owner->nativeformats;
iaxs[fr.callno]->owner->nativeformats = f.subclass;
if (iaxs[fr.callno]->owner->readformat)
ast_set_read_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->readformat);
ast_set_read_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->readformat, 0);
iaxs[fr.callno]->owner->nativeformats = orignative;
ast_mutex_unlock(&iaxs[fr.callno]->owner->lock);
}
@@ -3981,9 +3981,9 @@ retryowner:
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);
ast_set_write_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->writeformat, 0);
if (iaxs[fr.callno]->owner->readformat)
ast_set_read_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->readformat);
ast_set_read_format(iaxs[fr.callno]->owner, iaxs[fr.callno]->owner->readformat, 0);
}
}
ast_mutex_lock(&dpcache_lock);

4
channels/chan_mgcp.c
View File

@@ -1307,8 +1307,8 @@ static int rtpready(struct ast_rtp *rtp, struct ast_frame *f, void *data)
if (f->subclass != p->owner->nativeformats) {
ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass);
p->owner->nativeformats = f->subclass;
ast_set_read_format(p->owner, p->owner->readformat);
ast_set_write_format(p->owner, p->owner->writeformat);
ast_set_read_format(p->owner, p->owner->readformat, 0);
ast_set_write_format(p->owner, p->owner->writeformat, 0);
}
if (p->dtmfinband) {
f = ast_dsp_process(p->owner,p->dsp,f,0);