aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-06 14:25:31 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-06 14:25:31 +0000
commitb16b17e312d90614edf4039e18b7ecc91d7cd9e2 (patch)
tree21527c8a07b28d6075ead730fd133b6ce74f4434
parent4cd3978509e41d620011949a722f2ce1fb9c074f (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@67696 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--rtp.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/rtp.c b/rtp.c
index 2f655a657..6bb021822 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 */