kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-25 06:00:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix timestamp issue with features (bug #4760 with mods)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6268 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-08-03 04:42:59 +00:00
parent 6e825f933d
commit 8712d1d7f1
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
res/res_features.c
View File

@@ -1118,6 +1118,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
memset(&backup_config, 0, sizeof(backup_config));
config->start_time = ast_tvnow();
if (chan && peer) {
pbx_builtin_setvar_helper(chan, "BRIDGEPEER", peer->name);
pbx_builtin_setvar_helper(peer, "BRIDGEPEER", chan->name);
@@ -1161,26 +1163,28 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
peer->cdr = NULL;
}
for (;;) {
if (config->timelimit)
if (config->feature_timer)
start = ast_tvnow();
res = ast_channel_bridge(chan, peer, config, &f, &who);
if (config->timelimit) {
if (config->feature_timer) {
/* Update time limit for next pass */
diff = ast_tvdiff_ms(ast_tvnow(), start);
config->timelimit -= diff;
config->feature_timer -= diff;
if (hasfeatures) {
/* Running on backup config, meaning a feature might be being
activated, but that's no excuse to keep things going
indefinitely! */
if (backup_config.timelimit && ((backup_config.timelimit -= diff) <= 0)) {
if (backup_config.feature_timer && ((backup_config.feature_timer -= diff) <= 0)) {
ast_log(LOG_DEBUG, "Timed out, realtime this time!\n");
config->timelimit = 0;
config->feature_timer = 0;
who = chan;
if (f)
ast_frfree(f);
f = NULL;
res = 0;
} else if (config->timelimit <= 0) {
} else if (config->feature_timer <= 0) {
/* Not *really* out of time, just out of time for
digits to come in for features. */
ast_log(LOG_DEBUG, "Timed out for feature!\n");
@@ -1205,9 +1209,9 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
continue;
}
} else {
if (config->timelimit <=0) {
if (config->feature_timer <=0) {
/* We ran out of time */
config->timelimit = 0;
config->feature_timer = 0;
who = chan;
if (f)
ast_frfree(f);
@@ -1272,7 +1276,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
featurecode = peer_featurecode;
}
featurecode[strlen(featurecode)] = f->subclass;
config->timelimit = backup_config.timelimit;
config->feature_timer = backup_config.feature_timer;
res = ast_feature_interpret(chan, peer, config, featurecode, sense);
switch(res) {
case FEATURE_RETURN_PASSDIGITS:
@@ -1307,8 +1311,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
config->start_sound = NULL;
config->firstpass = 0;
}
config->timelimit = featuredigittimeout;
ast_log(LOG_DEBUG, "Set time limit to %ld\n", config->timelimit);
config->feature_timer = featuredigittimeout;
ast_log(LOG_DEBUG, "Set time limit to %ld\n", config->feature_timer);
}
}
if (f)