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/branches/1.4@68922 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/rtp.c b/main/rtp.c
index 8eaa0a4535218ddd091c3b1eef0348927721746a..01e7664c3248358b8ba3552c24625d49f7ba0f9a 100644 (file)
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -2959,6 +2959,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, 0, 0))
+               ast_log(LOG_WARNING, "Channel '%s' failed to break RTP bridge\n", c0->name);
+       if (pr1->set_rtp_peer(c1, NULL, NULL, 0, 0))
+               ast_log(LOG_WARNING, "Channel '%s' failed to break RTP bridge\n", c1->name);
+
        return AST_BRIDGE_FAILED;
 }