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

[SVN commits to the Asterisk project]

Author: may
Date: Sun Feb  6 17:27:41 2011
New Revision: 306540

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306540
Log:
up to svn

Modified:
    team/may/ooh323_ipv6_direct_rtp/   (props changed)
    team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c
    team/may/ooh323_ipv6_direct_rtp/cel/cel_odbc.c   (props changed)
    team/may/ooh323_ipv6_direct_rtp/configs/cel_odbc.conf.sample   (props changed)
    team/may/ooh323_ipv6_direct_rtp/sounds/Makefile   (props changed)

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
    svn:mergeinfo = /team/may/ooh323_ipv6:301110-306539

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Feb  6 17:27:41 2011
@@ -1,1 +1,1 @@
-/team/may/ooh323_ipv6:1-301087
+/team/may/ooh323_ipv6:1-306539

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=306540&r1=306539&r2=306540
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c Sun Feb  6 17:27:41 2011
@@ -2188,11 +2188,15 @@
 
    	user = ast_calloc(1,sizeof(struct ooh323_user));
 	if (user) {
+		memset(user, 0, sizeof(struct ooh323_user));
 		if (!(user->cap = ast_format_cap_alloc_nolock())) {
 			ast_free(user);
 			return NULL;
 		}
-		memset(user, 0, sizeof(struct ooh323_user));
+		if (!(user->cap = ast_format_cap_alloc_nolock())) {
+			ast_free(user);
+			return NULL;
+		}
 		ast_mutex_init(&user->lock);
 		ast_copy_string(user->name, name, sizeof(user->name));
 		ast_format_cap_copy(user->cap, gCap);
@@ -2303,11 +2307,15 @@
 
 	peer = ast_calloc(1, sizeof(*peer));
 	if (peer) {
+		memset(peer, 0, sizeof(struct ooh323_peer));
 		if (!(peer->cap = ast_format_cap_alloc_nolock())) {
 			ast_free(peer);
 			return NULL;
 		}
-		memset(peer, 0, sizeof(struct ooh323_peer));
+		if (!(peer->cap = ast_format_cap_alloc_nolock())) {
+			ast_free(peer);
+			return NULL;
+		}
 		ast_mutex_init(&peer->lock);
 		ast_copy_string(peer->name, name, sizeof(peer->name));
 		ast_format_cap_copy(peer->cap, gCap);
@@ -3947,6 +3955,10 @@
 	if (gH323Debug)
 		ast_verbose("---   ooh323_set_peer - %s\n", chan->name);
 
+	if (!rtp) {
+		return 0;
+	}
+
 	mode = ooh323_convertAsteriskCapToH323Cap(&chan->writeformat); 
 	p = (struct ooh323_pvt *) chan->tech_pvt;
 	if (!p) {

Propchange: team/may/ooh323_ipv6_direct_rtp/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb  6 17:27:41 2011
@@ -1,1 +1,2 @@
 /be/branches/C.3/cel/cel_adaptive_odbc.c:256426
+/team/may/ooh323_ipv6/cel/cel_odbc.c:301110-306539

Propchange: team/may/ooh323_ipv6_direct_rtp/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb  6 17:27:41 2011
@@ -1,1 +1,2 @@
 /be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
+/team/may/ooh323_ipv6/configs/cel_odbc.conf.sample:301110-306539

Propchange: team/may/ooh323_ipv6_direct_rtp/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb  6 17:27:41 2011
@@ -1,2 +1,3 @@
 /be/branches/C.3/sounds/Makefile:256426
+/team/may/ooh323_ipv6/sounds/Makefile:301110-306539
 /trunk/sounds/Makefile:270974