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)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@38687 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channel.c b/channel.c
index dce6d0a..eb2c963 100644 (file)
--- a/channel.c
+++ b/channel.c
@@ -3564,7 +3564,6 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
        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 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
        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;

diff --git a/res/res_features.c b/res/res_features.c
index 85ed558..faf48b4 100644 (file)
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1464,6 +1464,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
                                        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);