From d0eaf1e3893cca69a78c6f80e247d43afc081520 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 12 Jun 2007 14:26:12 +0000 Subject: [PATCH] Merged revisions 68922 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r68922 | file | 2007-06-12 10:23:11 -0400 (Tue, 12 Jun 2007) | 10 lines Merged revisions 68921 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r68921 | file | 2007-06-12 10:18:57 -0400 (Tue, 12 Jun 2007) | 2 lines Bring RTP back to Asterisk at the end of a native bridge no matter what. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68923 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/rtp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/main/rtp.c b/main/rtp.c index e40126dd38..c3d29fb569 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -3096,6 +3096,11 @@ static enum ast_bridge_result bridge_native_loop(struct ast_channel *c0, struct cs[1] = cs[2]; } + if (pr0->set_rtp_peer(c0, NULL, NULL, NULL, 0, 0)) + ast_log(LOG_WARNING, "Channel '%s' failed to break RTP bridge\n", c0->name); + if (pr1->set_rtp_peer(c1, NULL, NULL, NULL, 0, 0)) + ast_log(LOG_WARNING, "Channel '%s' failed to break RTP bridge\n", c1->name); + return AST_BRIDGE_FAILED; }