diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-01 23:07:06 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-01 23:07:06 +0000 |
commit | 38e08dc15bf892b9e117f636911ab1bb4b9dee2b (patch) | |
tree | 79fef18ec8c45e67291404d5718a740a1988202b | |
parent | 71c993303b7625c29438c3dacaea33f4ac495f0e (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.2@38686 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channel.c | 15 | ||||
-rw-r--r-- | res/res_features.c | 1 |
2 files changed, 12 insertions, 4 deletions
@@ -3380,7 +3380,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", @@ -3432,20 +3431,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 703b7fd82..3d6f22cc5 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1472,6 +1472,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; ast_log(LOG_DEBUG, "Set time limit to %ld\n", config->feature_timer); } |