kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 11:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix mgcp bug (bug #2696)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4105 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2004-10-26 15:34:30 +00:00
parent ef3f4d29c9
commit 124c88fba3
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
channels/chan_mgcp.c
View File

@@ -1078,7 +1078,11 @@ static struct ast_frame *mgcp_rtp_read(struct mgcp_subchannel *sub)
{
/* Retrieve audio/etc from channel. Assumes sub->lock is already held. */
struct ast_frame *f;
static struct ast_frame null_frame = { AST_FRAME_NULL, };
f = ast_rtp_read(sub->rtp);
/* Don't send RFC2833 if we're not supposed to */
if (f && (f->frametype == AST_FRAME_DTMF) && !(sub->parent->dtmfmode & MGCP_DTMF_RFC2833))
return &null_frame;
if (sub->owner) {
/* We already hold the channel lock */
if (f->frametype == AST_FRAME_VOICE) {
@@ -1089,7 +1093,7 @@ static struct ast_frame *mgcp_rtp_read(struct mgcp_subchannel *sub)
ast_set_write_format(sub->owner, sub->owner->writeformat);
}
/* Courtesy fearnor aka alex@pilosoft.com */
if (sub->parent->dtmfmode & MGCP_DTMF_INBAND) {
if ((sub->parent->dtmfmode & MGCP_DTMF_INBAND) && (sub->parent->dsp)) {
#if 0
ast_log(LOG_NOTICE, "MGCP ast_dsp_process\n");
#endif
@@ -1103,18 +1107,12 @@ static struct ast_frame *mgcp_rtp_read(struct mgcp_subchannel *sub)
static struct ast_frame *mgcp_read(struct ast_channel *ast)
{
struct ast_frame *fr;
struct ast_frame *f;
struct mgcp_subchannel *sub = ast->pvt->pvt;
static struct ast_frame null_frame = { AST_FRAME_NULL, };
ast_mutex_lock(&sub->lock);
fr = mgcp_rtp_read(sub);
if (!(sub->parent->dtmfmode & MGCP_DTMF_RFC2833)) {
if (fr && (fr->frametype == AST_FRAME_DTMF)) {
fr = &null_frame;
}
}
f = mgcp_rtp_read(sub);
ast_mutex_unlock(&sub->lock);
return fr;
return f;
}
static int mgcp_write(struct ast_channel *ast, struct ast_frame *frame)