[asterisk-commits] may: trunk r311688 - in /trunk: ./ addons/chan_ooh323.c

[SVN commits to the Asterisk project]

Author: may
Date: Sun Mar 27 16:49:03 2011
New Revision: 311688

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=311688
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/addons/chan_ooh323.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/chan_ooh323.c?view=diff&rev=311688&r1=311687&r2=311688
==============================================================================
--- trunk/addons/chan_ooh323.c (original)
+++ trunk/addons/chan_ooh323.c Sun Mar 27 16:49:03 2011
@@ -1193,6 +1193,7 @@
 
 	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 @@
 				if (!p->chmodepend && !p->faxmode) {
 					ooRequestChangeMode(p->callToken, 1);
 					p->chmodepend = 1;
+					res = 0;
 				}
 				break;
 
@@ -1305,6 +1307,7 @@
 				if (!p->chmodepend && p->faxmode) {
 					ooRequestChangeMode(p->callToken, 0);
 					p->chmodepend = 1;
+					res = 0;
 				}
 				break;
 
@@ -1330,7 +1333,7 @@
 		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)