diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-11 21:06:53 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-11 21:06:53 +0000 |
commit | 4ceeb9b099c9637dbd326cd549a102f83536918a (patch) | |
tree | cc4789be25583bf37b1e968d53db65e9b2791948 /apps/app_dial.c | |
parent | de20dcba4e068e3c6bc2e73127460c89ef24e4bc (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@19344 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dial.c')
-rw-r--r-- | apps/app_dial.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 5ec606062..c323480b2 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 1999 - 2005, Digium, Inc. + * Copyright (C) 1999 - 2006, Digium, Inc. * * Mark Spencer <markster@digium.com> * @@ -827,6 +827,21 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags if (!timelimit) { timelimit = play_to_caller = play_to_callee = play_warning = warning_freq = 0; warning_sound = NULL; + } 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"); |