summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2008-04-09 18:05:40 +0000
committerJoshua Colp <jcolp@digium.com>2008-04-09 18:05:40 +0000
commit0351ef6e6ec0999163a3ea6585ce9bd2e5bafcdb (patch)
tree2250b12bd1580022f0506fe777a9adfe065d9df5
parente735c70ce1998d21693f5d5bf1d894f7ff74affe (diff)
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
-rw-r--r--channels/chan_h323.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 10ef7e133..140c06fa3 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;