From f40edf2793940a31716d21252f43441488044e6e Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Tue, 17 Feb 2009 22:08:00 +0000 Subject: Merged revisions 176701 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r176701 | jpeeler | 2009-02-17 15:54:34 -0600 (Tue, 17 Feb 2009) | 17 lines Modify bridging to properly evaluate DTMF after first warning is played The main problem is currently if the Dial flag L is used with a warning sound, DTMF is not evaluated after the first warning sound. To fix this, a flag has been added in ast_generic_bridge for playing the warning which ensures that if a scheduled warning is missed, multiple warrnings are not played back (due to a feature evaluation or waiting for digits). ast_channel_bridge was modified to store the nexteventts in the ast_bridge_config structure as that information was lost every time ast_channel_bridge was reentered, causing a hangup due to incorrect time calculations. (closes issue #14315) Reported by: tim_ringenbach Reviewed on reviewboard: http://reviewboard.digium.com/r/163/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@176708 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/channel.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/asterisk/channel.h') diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 04769e7c6..533e8b6bc 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -572,6 +572,7 @@ enum { AST_FEATURE_PARKCALL = (1 << 5), AST_FEATURE_AUTOMIXMON = (1 << 6), AST_FEATURE_NO_H_EXTEN = (1 << 7), + AST_FEATURE_WARNING_ACTIVE = (1 << 7), }; /*! \brief bridge configuration */ @@ -579,6 +580,7 @@ struct ast_bridge_config { struct ast_flags features_caller; struct ast_flags features_callee; struct timeval start_time; + struct timeval nexteventts; long feature_timer; long timelimit; long play_warning; -- cgit v1.2.3