[asterisk-commits] file: trunk r113840 - /trunk/channels/chan_h323.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Apr  9 13:05:40 2008
New Revision: 113840

URL: http://svn.digium.com/view/asterisk?view=rev&rev=113840
Log:
Enable enough RTP bridging to allow P2P to work.
(closes issue #11901)
Reported by: pj

Modified:
    trunk/channels/chan_h323.c

Modified: trunk/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_h323.c?view=diff&rev=113840&r1=113839&r2=113840
==============================================================================
--- trunk/channels/chan_h323.c (original)
+++ trunk/channels/chan_h323.c Wed Apr  9 13:05:40 2008
@@ -254,10 +254,7 @@
 	.write = oh323_write,
 	.indicate = oh323_indicate,
 	.fixup = oh323_fixup,
-	/* disable, for now */
-#if 0
 	.bridge = ast_rtp_bridge,
-#endif
 };
 
 static const char* redirectingreason2str(int redirectingreason)
@@ -3092,10 +3089,12 @@
 		return AST_RTP_GET_FAILED;
 
 	ast_mutex_lock(&pvt->lock);
-	if (pvt->rtp && pvt->options.bridge) {
-		*rtp = pvt->rtp;
+	*rtp = pvt->rtp;
+#if 0
+	if (pvt->options.bridge) {
 		res = AST_RTP_TRY_NATIVE;
 	}
+#endif
 	ast_mutex_unlock(&pvt->lock);
 
 	return res;