diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-04-11 20:11:36 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-04-11 20:11:36 +0000 |
| commit | 77e998a20d88d37c0d3a8fed2c6435203c6cfa6c (patch) | |
| tree | e944fdb93f967cb2664065d7cff5acbaa6ab9122 /apps/app_dial.c | |
| parent | df365777e781178bd87a7cbe29fe2747dae158be (diff) | |
Merged revisions 19301 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r19301 | kpfleming | 2006-04-11 15:11:01 -0500 (Tue, 11 Apr 2006) | 2 lines
handle call time limit properly when warning is requested _after_ call would hae already ended (issue #6356)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@19302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_dial.c')
| -rw-r--r-- | apps/app_dial.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index e2eb2b80b..0ee6e3f8b 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -841,6 +841,21 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags ast_log(LOG_WARNING, "Dial does not accept L(%s), hanging up.\n", limit_str); LOCAL_USER_REMOVE(u); return -1; + } else if (play_warning > timelimit) { + /* If the first warning is requested _after_ the entire call would end, + and no warning frequency is requested, then turn off the warning. If + a warning frequency is requested, reduce the 'first warning' time by + that frequency until it falls within the call's total time limit. + */ + + if (!warning_freq) { + play_warning = 0; + } else { + while (play_warning > timelimit) + play_warning -= warning_freq; + if (play_warning < 1) + play_warning = warning_freq = 0; + } } var = pbx_builtin_getvar_helper(chan,"LIMIT_PLAYAUDIO_CALLER"); |