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

[SVN commits to the Asterisk project]

Author: may
Date: Wed Jul  4 15:39:43 2012
New Revision: 369612

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369612
Log:
fixes according current channel interface
codes goes to the trunk

Modified:
    team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c
    team/may/ooh323_ipv6_direct_rtp/main/astmm.c
    team/may/ooh323_ipv6_direct_rtp/main/rtp_engine.c

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=369612&r1=369611&r2=369612
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c Wed Jul  4 15:39:43 2012
@@ -4182,13 +4182,15 @@
 
 static void ooh323_get_codec(struct ast_channel *chan, struct ast_format_cap *result)
 {
-	struct ooh323_pvt *p = chan->tech_pvt;
+	struct ooh323_pvt *p = (struct ooh323_pvt *) ast_channel_tech_pvt(chan);
 	if (gH323Debug) {
 		ast_verb(0, "+++ ooh323  get_codec, %s\n", ast_channel_name(chan));
 	}
 
-	ast_format_cap_append(result,  ast_format_cap_is_empty(chan->nativeformats) ?
-				(ast_format_cap_is_empty(p->cap) ? NULL : p->cap) : chan->nativeformats);
+	if (p) {
+		ast_format_cap_append(result,  ast_format_cap_is_empty(ast_channel_nativeformats(chan)) ?
+				(ast_format_cap_is_empty(p->cap) ? NULL : p->cap) : ast_channel_nativeformats(chan));
+	}
 
 	if (gH323Debug) {
 		ast_verb(0, "--- ooh323  get_codec, %s\n", ast_channel_name(chan));
@@ -4218,7 +4220,7 @@
 
 	/* there must be checking of directmedia setting */
 
-	if ((chan->_state != AST_STATE_UP && !p->earlydirect) || !p->directrtp) {
+	if ((ast_channel_state(chan) != AST_STATE_UP && !p->earlydirect) || !p->directrtp) {
 		res = AST_RTP_GLUE_RESULT_LOCAL;
 	} else {
 		res = AST_RTP_GLUE_RESULT_REMOTE;
@@ -4320,7 +4322,7 @@
 {
 	/* XXX Deal with Video */
 	struct ooh323_pvt *p;
-	int mode, changed = 0;
+	int changed = 0;
 	char *callToken = NULL;
 
 	if (gH323Debug) {

Modified: team/may/ooh323_ipv6_direct_rtp/main/astmm.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/main/astmm.c?view=diff&rev=369612&r1=369611&r2=369612
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/main/astmm.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/main/astmm.c Wed Jul  4 15:39:43 2012
@@ -225,7 +225,6 @@
 	return __ast_alloc_region(size, FUNC_MALLOC, file, lineno, func, 0);
 }
 
-<<<<<<< .working
 void *_ast_malloc(size_t size, const char *file, int lineno, const char *func) 
 {
 	return __ast_alloc_region(size, FUNC_MALLOC, file, lineno, func, 0);

Modified: team/may/ooh323_ipv6_direct_rtp/main/rtp_engine.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/main/rtp_engine.c?view=diff&rev=369612&r1=369611&r2=369612
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/main/rtp_engine.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/main/rtp_engine.c Wed Jul  4 15:39:43 2012
@@ -1536,7 +1536,6 @@
 			ast_channel_name(c0), ast_channel_name(c1));
 	}
 
-	res = 0;
 	/* Setup SDP */
 	if (glue0->update_peer(c0, instance1, vinstance1, tinstance1, cap1, 0)) {
 		ast_log(LOG_WARNING, "Channel '%s' failed to setup early SDP to '%s'\n", ast_channel_name(c0), c1 ? ast_channel_name(c1) : "<unspecified>");