From 34258cf2027faefe13edbfd11ba3013a2f9d9d6d Mon Sep 17 00:00:00 2001 From: Paul Cadach Date: Sun, 1 Oct 2006 19:40:00 +0000 Subject: [PATCH] Merged revisions 44135 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ r44135 | pcadach | 2006-10-02 01:32:24 +0600 (Пнд, 02 Окт 2006) | 1 line Do not simulate any audio tones if we got PROGRESS message ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44136 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_h323.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/channels/chan_h323.c b/channels/chan_h323.c index adc0dcd3f3..abe68d7da8 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -193,6 +193,7 @@ struct oh323_pvt { int txDtmfDigit; /* DTMF digit being to send to H.323 side */ int noInbandDtmf; /* Inband DTMF processing by DSP isn't available */ int connection_established; /* Call got CONNECT message */ + int got_progress; /* Call got PROGRESS message, pass inband audio */ struct oh323_pvt *next; /* Next channel in list */ } *iflist = NULL; @@ -864,9 +865,14 @@ static int oh323_indicate(struct ast_channel *c, int condition, const void *data struct oh323_pvt *pvt = (struct oh323_pvt *) c->tech_pvt; char *token = (char *)NULL; + int res = -1; + int got_progress; ast_mutex_lock(&pvt->lock); token = (pvt->cd.call_token ? strdup(pvt->cd.call_token) : NULL); + got_progress = pvt->got_progress; + if (condition == AST_CONTROL_PROGRESS) + pvt->got_progress = 1; ast_mutex_unlock(&pvt->lock); if (h323debug) @@ -876,6 +882,7 @@ static int oh323_indicate(struct ast_channel *c, int condition, const void *data case AST_CONTROL_RINGING: if (c->_state == AST_STATE_RING || c->_state == AST_STATE_RINGING) { h323_send_alerting(token); + res = (got_progress ? 0 : -1); /* Do not simulate any audio tones if we got PROGRESS message */ break; } if (token) @@ -883,7 +890,9 @@ static int oh323_indicate(struct ast_channel *c, int condition, const void *data return -1; case AST_CONTROL_PROGRESS: if (c->_state != AST_STATE_UP) { - h323_send_progress(token); + /* Do not send PROGRESS message more than once */ + if (!got_progress) + h323_send_progress(token); break; } if (token) @@ -944,7 +953,7 @@ static int oh323_indicate(struct ast_channel *c, int condition, const void *data free(token); oh323_update_info(c); - return -1; + return res; } static int oh323_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)