diff options
| author | dbrooks <dbrooks@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-26 20:18:11 +0000 |
|---|---|---|
| committer | dbrooks <dbrooks@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-26 20:18:11 +0000 |
| commit | 7abd919a093808594d2ef5ebb6967145a786f2dd (patch) | |
| tree | b52bba34cdd98501bc089481511839745dc845ea /apps/app_voicemail.c | |
| parent | d1ff474a711f30376c5079f76b7ea304d947d14c (diff) | |
Merged revisions 203721 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r203721 | dbrooks | 2009-06-26 15:13:51 -0500 (Fri, 26 Jun 2009) | 16 lines
Fixing voicemail's error in checking max silence vs min message length
Max silence was represented in milliseconds, yet vmminsecs (minmessage) was represented
as seconds.
Also, the inequality was reversed. The warning, if triggered, was "Max silence should
be less than minmessage or you may get empty messages", which should have been logged
if max silence was greater than minmessage, but the check was for less than.
Also, conforming if statement to coding guidelines.
closes issue #15331)
Reported by: markd
Review: https://reviewboard.asterisk.org/r/293/
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@203727 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_voicemail.c')
| -rw-r--r-- | apps/app_voicemail.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 66e3b402f..af11228d0 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -10557,8 +10557,9 @@ static int load_config(int reload) if ((val = ast_variable_retrieve(cfg, "general", "minsecs"))) { if (sscanf(val, "%d", &x) == 1) { vmminsecs = x; - if (maxsilence <= vmminsecs) + if (maxsilence / 1000 >= vmminsecs) { ast_log(AST_LOG_WARNING, "maxsilence should be less than minmessage or you may get empty messages\n"); + } } else { ast_log(AST_LOG_WARNING, "Invalid min message time length\n"); } @@ -10570,8 +10571,9 @@ static int load_config(int reload) } if (sscanf(val, "%d", &x) == 1) { vmminsecs = x; - if (maxsilence <= vmminsecs) + if (maxsilence / 1000 >= vmminsecs) { ast_log(AST_LOG_WARNING, "maxsilence should be less than minmessage or you may get empty messages\n"); + } } else { ast_log(AST_LOG_WARNING, "Invalid min message time length\n"); } |