[svn-commits] file: trunk r47708 - in /trunk: ./ main/channel.c

[svn-commits at lists.digium.com]

Author: file
Date: Wed Nov 15 15:36:13 2006
New Revision: 47708

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47708
Log:
Merged revisions 47707 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47707 | file | 2006-11-15 16:33:41 -0500 (Wed, 15 Nov 2006) | 2 lines

We need to ensure timelimit stuff is included as well so warnings get played. (issue #8050 reported by KNK)

........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=47708&r1=47707&r2=47708
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Wed Nov 15 15:36:13 2006
@@ -3658,7 +3658,10 @@
 		if (bridge_end.tv_sec) {
 			to = ast_tvdiff_ms(bridge_end, ast_tvnow());
 			if (to <= 0) {
-				res = AST_BRIDGE_COMPLETE;
+				if (config->timelimit)
+					res = AST_BRIDGE_RETRY;
+				else
+					res = AST_BRIDGE_COMPLETE;
 				break;
 			}
 		} else
@@ -3851,8 +3854,11 @@
 			now = ast_tvnow();
 			to = ast_tvdiff_ms(nexteventts, now);
 			if (to <= 0) {
-				res = AST_BRIDGE_COMPLETE;
-				break;
+				if (!config->timelimit) {
+					res = AST_BRIDGE_COMPLETE;
+					break;
+				}
+				to = 0;
 			}
 		}