automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@67696 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/rtp.c b/rtp.c
index 2f655a6577946a285821d221f94e2493f7af37ed..6bb0218224b85ea65033ec331658402bb081fd3e 100644 (file)
--- a/rtp.c
+++ b/rtp.c
@@ -1728,8 +1728,13 @@ enum ast_bridge_result ast_rtp_bridge(struct ast_channel *c0, struct ast_channel
                }
                who = ast_waitfor_n(cs, 2, &timeoutms);
                if (!who) {
-                       if (!timeoutms) 
+                       if (!timeoutms) {
+                               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_RETRY;
+                       }
                        if (option_debug)
                                ast_log(LOG_DEBUG, "Ooh, empty read...\n");
                        /* check for hangup / whentohangup */