From 65767b4290fbd7f2d99bd82dff08d94e44bd399b Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 1 Apr 2008 18:02:43 +0000 Subject: [PATCH] Disable Packet2Packet bridging when we need to feed DTMF frames into the core. Some implementations do not like how we switch between things. (closes issue #12212) Reported by: bamby git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@112209 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/rtp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/rtp.c b/main/rtp.c index 6cb7fb6baf..01d46e6d08 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -3368,9 +3368,9 @@ enum ast_bridge_result ast_rtp_bridge(struct ast_channel *c0, struct ast_channel audio_p1_res = AST_RTP_TRY_PARTIAL; } - /* If the core will need to compensate and the P2P bridge will need to feed up DTMF frames then we can not reliably do so yet, so do not P2P bridge */ - if ((audio_p0_res == AST_RTP_TRY_PARTIAL && ast_test_flag(p0, FLAG_P2P_NEED_DTMF) && ast_test_flag(p0, FLAG_DTMF_COMPENSATE)) || - (audio_p1_res == AST_RTP_TRY_PARTIAL && ast_test_flag(p1, FLAG_P2P_NEED_DTMF) && ast_test_flag(p1, FLAG_DTMF_COMPENSATE))) { + /* If we need to feed frames into the core don't do a P2P bridge */ + if ((audio_p0_res == AST_RTP_TRY_PARTIAL && ast_test_flag(p0, FLAG_P2P_NEED_DTMF)) || + (audio_p1_res == AST_RTP_TRY_PARTIAL && ast_test_flag(p1, FLAG_P2P_NEED_DTMF))) { ast_channel_unlock(c0); ast_channel_unlock(c1); return AST_BRIDGE_FAILED_NOWARN;