[asterisk-commits] jpeeler: trunk r176708 - in /trunk: ./ include/asterisk/ main/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Feb 17 16:08:01 CST 2009
Author: jpeeler
Date: Tue Feb 17 16:08:00 2009
New Revision: 176708
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=176708
Log:
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
Reviewed on reviewboard:
http://reviewboard.digium.com/r/163/
........
Modified:
trunk/ (props changed)
trunk/include/asterisk/channel.h
trunk/main/channel.c
trunk/main/features.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/include/asterisk/channel.h
URL: http://svn.digium.com/svn-view/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=176708&r1=176707&r2=176708
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Tue Feb 17 16:08:00 2009
@@ -572,6 +572,7 @@
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_flags features_caller;
struct ast_flags features_callee;
struct timeval start_time;
+ struct timeval nexteventts;
long feature_timer;
long timelimit;
long play_warning;
Modified: trunk/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/channel.c?view=diff&rev=176708&r1=176707&r2=176708
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue Feb 17 16:08:00 2009
@@ -4378,10 +4378,13 @@
if (bridge_end.tv_sec) {
to = ast_tvdiff_ms(bridge_end, ast_tvnow());
if (to <= 0) {
- if (config->timelimit)
+ if (config->timelimit) {
res = AST_BRIDGE_RETRY;
- else
+ /* generic bridge ending to play warning */
+ ast_set_flag(config, AST_FEATURE_WARNING_ACTIVE);
+ } else {
res = AST_BRIDGE_COMPLETE;
+ }
break;
}
} else
@@ -4460,6 +4463,7 @@
ast_debug(1, "Got DTMF %s on channel (%s)\n",
f->frametype == AST_FRAME_DTMF_END ? "end" : "begin",
who->name);
+
break;
}
/* Write immediately frames, not passed through jb */
@@ -4531,7 +4535,6 @@
int o0nativeformats;
int o1nativeformats;
long time_left_ms=0;
- struct timeval nexteventts = { 0, };
char caller_warning = 0;
char callee_warning = 0;
@@ -4578,11 +4581,11 @@
o1nativeformats = c1->nativeformats;
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));
+ config->nexteventts = ast_tvadd(config->start_time, ast_samp2tv(config->feature_timer, 1000));
+ } else if (config->timelimit && firstpass) {
+ config->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));
+ config->nexteventts = ast_tvsub(config->nexteventts, ast_samp2tv(config->play_warning, 1000));
}
if (!c0->tech->send_digit_begin)
@@ -4602,9 +4605,9 @@
to = -1;
- if (!ast_tvzero(nexteventts)) {
+ if (!ast_tvzero(config->nexteventts)) {
now = ast_tvnow();
- to = ast_tvdiff_ms(nexteventts, now);
+ to = ast_tvdiff_ms(config->nexteventts, now);
if (to <= 0) {
if (!config->timelimit) {
res = AST_BRIDGE_COMPLETE;
@@ -4632,7 +4635,7 @@
}
if (!to) {
- if (time_left_ms >= 5000 && config->warning_sound && config->play_warning) {
+ if (time_left_ms >= 5000 && config->warning_sound && config->play_warning && ast_test_flag(config, AST_FEATURE_WARNING_ACTIVE)) {
int t = (time_left_ms + 500) / 1000; /* round to nearest second */
if (caller_warning)
bridge_playfile(c0, c1, config->warning_sound, t);
@@ -4640,10 +4643,11 @@
bridge_playfile(c1, c0, config->warning_sound, t);
}
if (config->warning_freq && (time_left_ms > (config->warning_freq + 5000)))
- nexteventts = ast_tvadd(nexteventts, ast_samp2tv(config->warning_freq, 1000));
+ config->nexteventts = ast_tvadd(config->nexteventts, ast_samp2tv(config->warning_freq, 1000));
else
- nexteventts = ast_tvadd(config->start_time, ast_samp2tv(config->timelimit, 1000));
+ config->nexteventts = ast_tvadd(config->start_time, ast_samp2tv(config->timelimit, 1000));
}
+ ast_clear_flag(config, AST_FEATURE_WARNING_ACTIVE);
}
if (c0->_softhangup == AST_SOFTHANGUP_UNBRIDGE || c1->_softhangup == AST_SOFTHANGUP_UNBRIDGE) {
@@ -4756,9 +4760,13 @@
if (!ast_strlen_zero(pbx_builtin_getvar_helper(c1, "BRIDGEPEER")))
pbx_builtin_setvar_helper(c1, "BRIDGEPEER", c0->name);
- res = ast_generic_bridge(c0, c1, config, fo, rc, nexteventts);
- if (res != AST_BRIDGE_RETRY)
+ res = ast_generic_bridge(c0, c1, config, fo, rc, config->nexteventts);
+ if (res != AST_BRIDGE_RETRY) {
break;
+ } else if (config->feature_timer) {
+ /* feature timer expired but has not been updated, sending to ast_bridge_call to do so */
+ break;
+ }
}
ast_clear_flag(c0, AST_FLAG_END_DTMF_ONLY);
Modified: trunk/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/features.c?view=diff&rev=176708&r1=176707&r2=176708
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Tue Feb 17 16:08:00 2009
@@ -2533,6 +2533,15 @@
if (config->feature_timer) {
/* Update time limit for next pass */
diff = ast_tvdiff_ms(ast_tvnow(), config->start_time);
+ if (res == AST_BRIDGE_RETRY) {
+ /* The feature fully timed out but has not been updated. Skip
+ * the potential round error from the diff calculation and
+ * explicitly set to expired. */
+ config->feature_timer = -1;
+ } else {
+ config->feature_timer -= diff;
+ }
+
config->feature_timer -= diff;
if (hasfeatures) {
/* Running on backup config, meaning a feature might be being
More information about the asterisk-commits
mailing list