From: Automerge Script <automerge@asterisk.org>
Date: Wed, 6 Jun 2007 14:25:31 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.19-netsec~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56944e5dfcb6e5c733d5dd13571f7be610fb8adc;p=thirdparty%2Fasterisk.git

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 2f655a6577..6bb0218224 100644
--- 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 */