mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-06 04:30:28 +00:00
Merged revisions 311687 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r311687 | may | 2011-03-28 01:47:13 +0400 (Mon, 28 Mar 2011) | 2 lines correct return values in ooh323_indicate for AST_CONTROL_T38_PARAMETERS ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@311688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1193,6 +1193,7 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d
|
|||||||
|
|
||||||
struct ooh323_pvt *p = (struct ooh323_pvt *) ast->tech_pvt;
|
struct ooh323_pvt *p = (struct ooh323_pvt *) ast->tech_pvt;
|
||||||
char *callToken = (char *)NULL;
|
char *callToken = (char *)NULL;
|
||||||
|
int res = -1;
|
||||||
|
|
||||||
if (!p) return -1;
|
if (!p) return -1;
|
||||||
|
|
||||||
@@ -1297,6 +1298,7 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d
|
|||||||
if (!p->chmodepend && !p->faxmode) {
|
if (!p->chmodepend && !p->faxmode) {
|
||||||
ooRequestChangeMode(p->callToken, 1);
|
ooRequestChangeMode(p->callToken, 1);
|
||||||
p->chmodepend = 1;
|
p->chmodepend = 1;
|
||||||
|
res = 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -1305,6 +1307,7 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d
|
|||||||
if (!p->chmodepend && p->faxmode) {
|
if (!p->chmodepend && p->faxmode) {
|
||||||
ooRequestChangeMode(p->callToken, 0);
|
ooRequestChangeMode(p->callToken, 0);
|
||||||
p->chmodepend = 1;
|
p->chmodepend = 1;
|
||||||
|
res = 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -1330,7 +1333,7 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d
|
|||||||
ast_verbose("++++ ooh323_indicate %d on %s\n", condition, callToken);
|
ast_verbose("++++ ooh323_indicate %d on %s\n", condition, callToken);
|
||||||
|
|
||||||
free(callToken);
|
free(callToken);
|
||||||
return -1;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ooh323_queryoption(struct ast_channel *ast, int option, void *data, int *datalen)
|
static int ooh323_queryoption(struct ast_channel *ast, int option, void *data, int *datalen)
|
||||||
|
Reference in New Issue
Block a user