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

Merge "chan_ooh323: fix ooManualProgress/ooManualRingback on ooh323 debuggin on"

Browse Source
This commit is contained in:
Richard Mudgett
2018-04-25 10:46:05 -05:00
committed by Gerrit Code Review
parent 56a9338fc1 c481afe873
commit 0464e773d8
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
addons/chan_ooh323.c
View File

@@ -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;
}