[asterisk-commits] qwell: trunk r64263 - in /trunk: apps/app_queue.c configs/queues.conf.sample

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Mon May 14 13:08:54 2007
New Revision: 64263

URL: http://svn.digium.com/view/asterisk?view=rev&rev=64263
Log:
Don't allow rounding seconds to weird values that may cause "unexpected" results.

Issue 9514.

Modified:
    trunk/apps/app_queue.c
    trunk/configs/queues.conf.sample

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?view=diff&rev=64263&r1=64262&r2=64263
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Mon May 14 13:08:54 2007
@@ -859,7 +859,9 @@
 		ast_log(LOG_DEBUG, "%s=%s for queue '%s'\n", param, val, q->name);
 	} else if (!strcasecmp(param, "announce-round-seconds")) {
 		q->roundingseconds = atoi(val);
-		if (q->roundingseconds>60 || q->roundingseconds<0) {
+		/* Rounding to any other values just doesn't make sense... */
+		if (!(q->roundingseconds == 0 || q->roundingseconds == 1 || q->roundingseconds == 5 || q->roundingseconds == 10
+			|| q->roundingseconds == 15 || q->roundingseconds == 20 || q->roundingseconds == 30)) {
 			if (linenum >= 0) {
 				ast_log(LOG_WARNING, "'%s' isn't a valid value for %s "
 					"using 0 instead for queue '%s' at line %d of queues.conf\n",

Modified: trunk/configs/queues.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/queues.conf.sample?view=diff&rev=64263&r1=64262&r2=64263
==============================================================================
--- trunk/configs/queues.conf.sample (original)
+++ trunk/configs/queues.conf.sample Mon May 14 13:08:54 2007
@@ -195,6 +195,7 @@
 ; What's the rounding time for the seconds?
 ; If this is non-zero, then we announce the seconds as well as the minutes
 ; rounded to this value.
+; Value values are 0, 1, 5, 10, 15, 20, and 30.
 ;
 ; announce-round-seconds = 10
 ;