From: Joshua Colp <jcolp@digium.com>
Date: Wed, 9 Apr 2008 18:05:40 +0000 (+0000)
Subject: Enable enough RTP bridging to allow P2P to work.
X-Git-Tag: 1.6.2.0-beta1~2516
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0351ef6e6ec0999163a3ea6585ce9bd2e5bafcdb;p=thirdparty%2Fasterisk.git

Enable enough RTP bridging to allow P2P to work.
(closes issue #11901)
Reported by: pj


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@113840 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 10ef7e1338..140c06fa37 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -254,10 +254,7 @@ static const struct ast_channel_tech oh323_tech = {
 	.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 @@ static enum ast_rtp_get_result oh323_get_rtp_peer(struct ast_channel *chan, stru
 		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;