From 97372f5985838f9482d8adcb7fb25dbff45f9228 Mon Sep 17 00:00:00 2001 From: murf Date: Thu, 26 Feb 2009 17:29:53 +0000 Subject: Merged revisions 178828 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r178828 | murf | 2009-02-26 10:22:11 -0700 (Thu, 26 Feb 2009) | 34 lines Merged revisions 178804 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r178804 | murf | 2009-02-26 10:09:03 -0700 (Thu, 26 Feb 2009) | 28 lines This patch prevents the feature detection timeout from being cut in half. Because the ast_channel_bridge() call will return 0 and pass a frame pointer for both DTMF_BEGIN and DTMF_END, the feature_timer field in hte config struct is getting decremented twice, which effectively cuts the digittimeout in half. I added conditions to the if statement to only let DTMF_END frames to flow thru, which solved the problem. Also, when the frame pointer is null, let control flow thru-- this usually happens on timeouts. I added a comment to the code to explain what's going on and why. Many thanks to sodom for reporting this problem. Personnally, it always seemed like something was wrong with the featuredigittimeout, but I never could quite decide what... and was too busy to investigate. This bug forced the issue, and now we know. Sodom had other issues in 14515, but I couldn't reproduce them. If he still has problems, and wants to get them solved, he is welcome to reopen 14515. (closes issue #14515) Reported by: sodom Patches: 14515.patch uploaded by murf (license 17) Tested by: murf, sodom ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@178866 f38db490-d61c-443f-a65b-d21fe96a405b --- main/features.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'main') diff --git a/main/features.c b/main/features.c index ffe06366b..94768d471 100644 --- a/main/features.c +++ b/main/features.c @@ -2263,8 +2263,15 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast struct ast_channel *other; /* used later */ res = ast_channel_bridge(chan, peer, config, &f, &who); - - if (config->feature_timer) { + + /* When frame is not set, we are probably involved in a situation + where we've timed out. + When frame is set, we'll come this code twice; once for DTMF_BEGIN + and also for DTMF_END. If we flow into the following 'if' for both, then + our wait times are cut in half, as both will subtract from the + feature_timer. Not good! + */ + if (config->feature_timer && (!f || f->frametype == AST_FRAME_DTMF_END)) { /* Update time limit for next pass */ diff = ast_tvdiff_ms(ast_tvnow(), config->start_time); if (res == AST_BRIDGE_RETRY) { -- cgit v1.2.3