[asterisk-commits] kmoore: trunk r402648 - in /trunk: ./ apps/app_queue.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Nov 11 09:37:05 CST 2013
Author: kmoore
Date: Mon Nov 11 09:37:03 2013
New Revision: 402648
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402648
Log:
app_queue: Honor penalty limits of 0
In the current app_queue code from 1.8 up to trunk the upper and lower
penalties can be set to 0 but the value is interpreted to be disabled
instead of actually setting limits. This is especially evident if min
and max limits are set to 0 and members with penalties of 0 and 1 are
in the queue since the member with penalty 1 will still receive calls.
This patch adjusts the special disabled value to be INT_MAX instead of
0.
(closes issue ASTERISK-20862)
Review: https://reviewboard.asterisk.org/r/2995/
Reported by: Schmooze Com
........
Merged revisions 402645 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 402646 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 402647 from http://svn.asterisk.org/svn/asterisk/branches/12
Modified:
trunk/ (props changed)
trunk/apps/app_queue.c
Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Mon Nov 11 09:37:03 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-402570,402582,402584,402593,402606
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-402570,402582,402584,402593,402606,402647
Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=402648&r1=402647&r2=402648
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Mon Nov 11 09:37:03 2013
@@ -2116,7 +2116,7 @@
ao2_lock(q);
mem_iter = ao2_iterator_init(q->members, 0);
for (; (member = ao2_iterator_next(&mem_iter)); ao2_ref(member, -1)) {
- if ((max_penalty && (member->penalty > max_penalty)) || (min_penalty && (member->penalty < min_penalty))) {
+ if ((max_penalty != INT_MAX && member->penalty > max_penalty) || (min_penalty != INT_MAX && member->penalty < min_penalty)) {
if (conditions & QUEUE_EMPTY_PENALTY) {
ast_debug(4, "%s is unavailable because his penalty is not between %d and %d\n", member->membername, min_penalty, max_penalty);
continue;
@@ -5005,26 +5005,55 @@
*/
static void update_qe_rule(struct queue_ent *qe)
{
- int max_penalty = qe->pr->max_relative ? qe->max_penalty + qe->pr->max_value : qe->pr->max_value;
- int min_penalty = qe->pr->min_relative ? qe->min_penalty + qe->pr->min_value : qe->pr->min_value;
- char max_penalty_str[20], min_penalty_str[20];
- /* a relative change to the penalty could put it below 0 */
- if (max_penalty < 0) {
- max_penalty = 0;
- }
- if (min_penalty < 0) {
- min_penalty = 0;
- }
- if (min_penalty > max_penalty) {
- min_penalty = max_penalty;
- }
- snprintf(max_penalty_str, sizeof(max_penalty_str), "%d", max_penalty);
- snprintf(min_penalty_str, sizeof(min_penalty_str), "%d", min_penalty);
- pbx_builtin_setvar_helper(qe->chan, "QUEUE_MAX_PENALTY", max_penalty_str);
- pbx_builtin_setvar_helper(qe->chan, "QUEUE_MIN_PENALTY", min_penalty_str);
- qe->max_penalty = max_penalty;
- qe->min_penalty = min_penalty;
- ast_debug(3, "Setting max penalty to %d and min penalty to %d for caller %s since %d seconds have elapsed\n", qe->max_penalty, qe->min_penalty, ast_channel_name(qe->chan), qe->pr->time);
+ int max_penalty = INT_MAX;
+
+ if (qe->max_penalty != INT_MAX) {
+ char max_penalty_str[20];
+
+ if (qe->pr->max_relative) {
+ max_penalty = qe->max_penalty + qe->pr->max_value;
+ } else {
+ max_penalty = qe->pr->max_value;
+ }
+
+ /* a relative change to the penalty could put it below 0 */
+ if (max_penalty < 0) {
+ max_penalty = 0;
+ }
+
+ snprintf(max_penalty_str, sizeof(max_penalty_str), "%d", max_penalty);
+ pbx_builtin_setvar_helper(qe->chan, "QUEUE_MAX_PENALTY", max_penalty_str);
+ qe->max_penalty = max_penalty;
+ ast_debug(3, "Setting max penalty to %d for caller %s since %d seconds have elapsed\n",
+ qe->max_penalty, ast_channel_name(qe->chan), qe->pr->time);
+ }
+
+ if (qe->min_penalty != INT_MAX) {
+ char min_penalty_str[20];
+ int min_penalty;
+
+ if (qe->pr->min_relative) {
+ min_penalty = qe->min_penalty + qe->pr->min_value;
+ } else {
+ min_penalty = qe->pr->min_value;
+ }
+
+ /* a relative change to the penalty could put it below 0 */
+ if (min_penalty < 0) {
+ min_penalty = 0;
+ }
+
+ if (max_penalty != INT_MAX && min_penalty > max_penalty) {
+ min_penalty = max_penalty;
+ }
+
+ snprintf(min_penalty_str, sizeof(min_penalty_str), "%d", min_penalty);
+ pbx_builtin_setvar_helper(qe->chan, "QUEUE_MIN_PENALTY", min_penalty_str);
+ qe->min_penalty = min_penalty;
+ ast_debug(3, "Setting min penalty to %d for caller %s since %d seconds have elapsed\n",
+ qe->min_penalty, ast_channel_name(qe->chan), qe->pr->time);
+ }
+
qe->pr = AST_LIST_NEXT(qe->pr, list);
}
@@ -5173,8 +5202,8 @@
unsigned char usepenalty = (membercount <= q->penaltymemberslimit) ? 0 : 1;
if (usepenalty) {
- if ((qe->max_penalty && (mem->penalty > qe->max_penalty)) ||
- (qe->min_penalty && (mem->penalty < qe->min_penalty))) {
+ if ((qe->max_penalty != INT_MAX && mem->penalty > qe->max_penalty) ||
+ (qe->min_penalty != INT_MAX && mem->penalty < qe->min_penalty)) {
return -1;
}
} else {
@@ -7589,10 +7618,10 @@
} else {
ast_log(LOG_WARNING, "${QUEUE_MAX_PENALTY}: Invalid value (%s), channel %s.\n",
max_penalty_str, ast_channel_name(chan));
- max_penalty = 0;
+ max_penalty = INT_MAX;
}
} else {
- max_penalty = 0;
+ max_penalty = INT_MAX;
}
if ((min_penalty_str = pbx_builtin_getvar_helper(chan, "QUEUE_MIN_PENALTY"))) {
@@ -7601,10 +7630,10 @@
} else {
ast_log(LOG_WARNING, "${QUEUE_MIN_PENALTY}: Invalid value (%s), channel %s.\n",
min_penalty_str, ast_channel_name(chan));
- min_penalty = 0;
+ min_penalty = INT_MAX;
}
} else {
- min_penalty = 0;
+ min_penalty = INT_MAX;
}
ast_channel_unlock(chan);
More information about the asterisk-commits
mailing list