[asterisk-commits] may: branch may/ooh323_ipv6_direct_rtp r311741 - in /team/may/ooh323_ipv6_dir...

[SVN commits to the Asterisk project]

Author: may
Date: Mon Mar 28 12:42:04 2011
New Revision: 311741

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=311741
Log:
Merged revisions 311705 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/may/ooh323_ipv6

................
  r311705 | root | 2011-03-28 02:23:43 +0400 (Mon, 28 Mar 2011) | 16 lines
  
  Merged revisions 311688 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ................
    r311688 | may | 2011-03-27 16:49:03 -0500 (Sun, 27 Mar 2011) | 9 lines
    
    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:
    team/may/ooh323_ipv6_direct_rtp/   (props changed)
    team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 28 12:42:04 2011
@@ -1,2 +1,2 @@
-/team/may/ooh323_ipv6:307716-307877,308283
+/team/may/ooh323_ipv6:307716-307877,308283,311705
 /trunk:307751-307752,308099-308157,308243

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-custom (original)
+++ svnmerge-custom Mon Mar 28 12:42:04 2011
@@ -1,1 +1,1 @@
-/team/may/ooh323_ipv6:1-308501
+/team/may/ooh323_ipv6:1-311739

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 28 12:42:04 2011
@@ -1,1 +1,1 @@
-/trunk:1-311633
+/trunk:1-311704

Modified: team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c?view=diff&rev=311741&r1=311740&r2=311741
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c Mon Mar 28 12:42:04 2011
@@ -1167,7 +1167,7 @@
 
 	struct ooh323_pvt *p = (struct ooh323_pvt *) ast->tech_pvt;
 	char *callToken = (char *)NULL;
-	int res = 0;
+	int res = -1;
 
 	if (!p) return -1;
 
@@ -1275,6 +1275,7 @@
 				if (!p->chmodepend && !p->faxmode) {
 					ooRequestChangeMode(p->callToken, 1);
 					p->chmodepend = 1;
+					res = 0;
 				}
 				break;
 
@@ -1283,6 +1284,7 @@
 				if (!p->chmodepend && p->faxmode) {
 					ooRequestChangeMode(p->callToken, 0);
 					p->chmodepend = 1;
+					res = 0;
 				}
 				break;