kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 08:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not simulate any audio tones if we got PROGRESS message

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@44135 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Cadach
2006-10-01 19:32:24 +00:00
parent aff14e6d89
commit 5ec38a80bf
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
channels/chan_h323.c
View File

@@ -192,6 +192,7 @@ struct oh323_pvt {
int txDtmfDigit; /* DTMF digit being to send to H.323 side */ int txDtmfDigit; /* DTMF digit being to send to H.323 side */
int noInbandDtmf; /* Inband DTMF processing by DSP isn't available */ int noInbandDtmf; /* Inband DTMF processing by DSP isn't available */
int connection_established; /* Call got CONNECT message */ 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 */ struct oh323_pvt *next; /* Next channel in list */
} *iflist = NULL; } *iflist = NULL;
@@ -861,9 +862,14 @@ static int oh323_indicate(struct ast_channel *c, int condition, const void *data
struct oh323_pvt *pvt = (struct oh323_pvt *) c->tech_pvt; struct oh323_pvt *pvt = (struct oh323_pvt *) c->tech_pvt;
char *token = (char *)NULL; char *token = (char *)NULL;
int res = -1;
int got_progress;
ast_mutex_lock(&pvt->lock); ast_mutex_lock(&pvt->lock);
token = (pvt->cd.call_token ? strdup(pvt->cd.call_token) : NULL); 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); ast_mutex_unlock(&pvt->lock);
if (h323debug) if (h323debug)
@@ -873,6 +879,7 @@ static int oh323_indicate(struct ast_channel *c, int condition, const void *data
case AST_CONTROL_RINGING: case AST_CONTROL_RINGING:
if (c->_state == AST_STATE_RING || c->_state == AST_STATE_RINGING) { if (c->_state == AST_STATE_RING || c->_state == AST_STATE_RINGING) {
h323_send_alerting(token); h323_send_alerting(token);
res = (got_progress ? 0 : -1); /* Do not simulate any audio tones if we got PROGRESS message */
break; break;
} }
if (token) if (token)
@@ -880,7 +887,9 @@ static int oh323_indicate(struct ast_channel *c, int condition, const void *data
return -1; return -1;
case AST_CONTROL_PROGRESS: case AST_CONTROL_PROGRESS:
if (c->_state != AST_STATE_UP) { 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; break;
} }
if (token) if (token)
@@ -938,7 +947,7 @@ static int oh323_indicate(struct ast_channel *c, int condition, const void *data
free(token); free(token);
oh323_update_info(c); oh323_update_info(c);
return -1; return res;
} }
static int oh323_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) static int oh323_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)