[asterisk-commits] murf: branch murf/bug_7638 r38712 - in /team/murf/bug_7638: ./ res/

[asterisk-commits at lists.digium.com]

Author: murf
Date: Tue Aug  1 19:52:04 2006
New Revision: 38712

URL: http://svn.digium.com/view/asterisk?rev=38712&view=rev
Log:
Merged revisions 38687 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r38687 | kpfleming | 2006-08-01 17:09:28 -0600 (Tue, 01 Aug 2006) | 10 lines

Merged revisions 38686 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r38686 | kpfleming | 2006-08-01 18:07:06 -0500 (Tue, 01 Aug 2006) | 2 lines

ensure that the 'feature digit timeout' value is taken into account when deciding how long the bridge should run (this fixes a problem report where a digit press that did not invoke a feature is never passed across the bridge)

........

................

Modified:
    team/murf/bug_7638/   (props changed)
    team/murf/bug_7638/channel.c
    team/murf/bug_7638/res/res_features.c

Propchange: team/murf/bug_7638/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/murf/bug_7638/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug  1 19:52:04 2006
@@ -1,1 +1,1 @@
-/trunk:1-38683
+/trunk:1-38711

Modified: team/murf/bug_7638/channel.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7638/channel.c?rev=38712&r1=38711&r2=38712&view=diff
==============================================================================
--- team/murf/bug_7638/channel.c (original)
+++ team/murf/bug_7638/channel.c Tue Aug  1 19:52:04 2006
@@ -3564,7 +3564,6 @@
 	struct timeval nexteventts = { 0, };
 	char caller_warning = 0;
 	char callee_warning = 0;
-	int to;
 
 	if (c0->_bridge) {
 		ast_log(LOG_WARNING, "%s is already in a bridge with %s\n",
@@ -3617,20 +3616,28 @@
 	o0nativeformats = c0->nativeformats;
 	o1nativeformats = c1->nativeformats;
 
-	if (config->timelimit) {
+	if (config->feature_timer) {
+		nexteventts = ast_tvadd(config->start_time, ast_samp2tv(config->feature_timer, 1000));
+	} else if (config->timelimit) {
 		nexteventts = ast_tvadd(config->start_time, ast_samp2tv(config->timelimit, 1000));
 		if (caller_warning || callee_warning)
 			nexteventts = ast_tvsub(nexteventts, ast_samp2tv(config->play_warning, 1000));
 	}
 
 	for (/* ever */;;) {
+		struct timeval now;
+		int to;
+
 		to = -1;
-		if (config->timelimit) {
-			struct timeval now;
+
+		if (!ast_tvzero(nexteventts)) {
 			now = ast_tvnow();
 			to = ast_tvdiff_ms(nexteventts, now);
 			if (to < 0)
 				to = 0;
+		}
+
+		if (config->timelimit) {
 			time_left_ms = config->timelimit - ast_tvdiff_ms(now, config->start_time);
 			if (time_left_ms < to)
 				to = time_left_ms;

Modified: team/murf/bug_7638/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7638/res/res_features.c?rev=38712&r1=38711&r2=38712&view=diff
==============================================================================
--- team/murf/bug_7638/res/res_features.c (original)
+++ team/murf/bug_7638/res/res_features.c Tue Aug  1 19:52:04 2006
@@ -1464,6 +1464,7 @@
 					config->start_sound = NULL;
 					config->firstpass = 0;
 				}
+				config->start_time = ast_tvnow();
 				config->feature_timer = featuredigittimeout;
 				if (option_debug)
 					ast_log(LOG_DEBUG, "Set time limit to %ld\n", config->feature_timer);