diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-17 21:54:34 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-17 21:54:34 +0000 |
| commit | 039864f4847dc5fcb2c26e236e5a8f4aa876f57d (patch) | |
| tree | 6d9cf4d3d35924dc9b641732ea157a388a09b2b2 /include | |
| parent | f2fd2b4b98978b606df45cb83e966fd0986bb315 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@176701 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 957d95d5c..f7718684b 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -529,12 +529,14 @@ enum { AST_FEATURE_AUTOMON = (1 << 4), AST_FEATURE_PARKCALL = (1 << 5), AST_FEATURE_NO_H_EXTEN = (1 << 6), + AST_FEATURE_WARNING_ACTIVE = (1 << 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; |