aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_vpb.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-10-14 17:02:20 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-10-14 17:02:20 +0000
commit8dd051949d230cb322c858ec5f841e02c0ef5355 (patch)
tree8676e4a61c82c8a223d1c42fcd7066b173f3a1b3 /channels/chan_vpb.c
parent9521172e85c010f6fdffc3a55fefb2cce518c843 (diff)
Make sure when the timeout occurs that we actually break the bridge (bug #5252)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6791 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_vpb.c')
-rwxr-xr-xchannels/chan_vpb.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c
index cebe6e2f7..93ab04e67 100755
--- a/channels/chan_vpb.c
+++ b/channels/chan_vpb.c
@@ -518,6 +518,10 @@ static enum ast_bridge_result vpb_bridge(struct ast_channel *c0, struct ast_chan
/* Are we really ment to be doing nothing ?!?! */
who = ast_waitfor_n(cs, 2, &timeoutms);
if (!who) {
+ if (!timeoutms) {
+ res = AST_BRIDGE_RETRY;
+ break;
+ }
ast_log(LOG_DEBUG, "%s: vpb_bridge: Empty frame read...\n",p0->dev);
/* check for hangup / whentohangup */
if (ast_check_hangup(c0) || ast_check_hangup(c1))