diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2018-04-25 10:46:05 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-04-25 10:46:05 -0500 |
| commit | 0464e773d8b0dd101f172b71ef2df854688b2cf7 (patch) | |
| tree | b74fa86f6c64452ee3e2a21d9ab8bb969eb9c7de | |
| parent | 56a9338fc1fa6dacd8c7cb7a770dbb3a7f3c8ff8 (diff) | |
| parent | c481afe8732ea89f92603b50326dcc632e013968 (diff) | |
Merge "chan_ooh323: fix ooManualProgress/ooManualRingback on ooh323 debuggin on"
| -rw-r--r-- | addons/chan_ooh323.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index 24cc65c0f..b456796d7 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -1281,7 +1281,7 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d struct ooh323_pvt *p = (struct ooh323_pvt *) ast_channel_tech_pvt(ast); char *callToken = (char *)NULL; - int res = -1; + int res = -1, rres; if (!p) return -1; @@ -1328,11 +1328,9 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d case AST_CONTROL_PROGRESS: if (ast_channel_state(ast) != AST_STATE_UP) { if (!p->progsent) { + rres = ooManualProgress(callToken); if (gH323Debug) { - ast_debug(1, "Sending manual progress for %s, res = %u\n", callToken, - ooManualProgress(callToken)); - } else { - ooManualProgress(callToken); + ast_debug(1, "Sending manual progress for %s, res = %u\n", callToken, rres); } p->progsent = 1; } @@ -1341,12 +1339,9 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d case AST_CONTROL_RINGING: if (ast_channel_state(ast) == AST_STATE_RING || ast_channel_state(ast) == AST_STATE_RINGING) { if (!p->alertsent) { + rres = ooManualRingback(callToken); if (gH323Debug) { - ast_debug(1, "Sending manual ringback for %s, res = %u\n", - callToken, - ooManualRingback(callToken)); - } else { - ooManualRingback(callToken); + ast_debug(1, "Sending manual ringback for %s, res = %u\n", callToken, rres); } p->alertsent = 1; } |