aboutsummaryrefslogtreecommitdiffstats
path: root/addons
diff options
context:
space:
mode:
authormay <may@f38db490-d61c-443f-a65b-d21fe96a405b>2011-03-27 21:49:03 +0000
committermay <may@f38db490-d61c-443f-a65b-d21fe96a405b>2011-03-27 21:49:03 +0000
commitb4212b376e481c08da063e449cf47152465d4daa (patch)
tree514fcc20843789ce93db3e2f6630ef4f868dfd3a /addons
parentdae83b5be0c355d172bb4fe7f8a60f6c724fd5ec (diff)
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: http://svn.digium.com/svn/asterisk/trunk@311688 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'addons')
-rw-r--r--addons/chan_ooh323.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index b04493001..08f0919ca 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -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;
char *callToken = (char *)NULL;
+ int res = -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) {
ooRequestChangeMode(p->callToken, 1);
p->chmodepend = 1;
+ res = 0;
}
break;
@@ -1305,6 +1307,7 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d
if (!p->chmodepend && p->faxmode) {
ooRequestChangeMode(p->callToken, 0);
p->chmodepend = 1;
+ res = 0;
}
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);
free(callToken);
- return -1;
+ return res;
}
static int ooh323_queryoption(struct ast_channel *ast, int option, void *data, int *datalen)