Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix reversed behavior of leavewhenempty option in queues.conf.

Browse Source 
(closes issue #14650)
Reported by: alecdavis
Patches:
      14650.patch uploaded by mmichelson (license 60)
Tested by: mmichelson, lmadsen



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@190250 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/1.8.6
Mark Michelson 17 years ago
parent ada8ae56e1
commit 8f81deab25
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File

12
apps/app_queue.c
Unescape View File

@ -1310,7 +1310,7 @@ static int insert_penaltychange (const char *list_name, const char *content, con
return 0; return 0;
} }
static void parse_empty_options(const char *value, enum empty_conditions *empty) static void parse_empty_options(const char *value, enum empty_conditions *empty, int joinempty)
{ {
char *value_copy = ast_strdupa(value); char *value_copy = ast_strdupa(value);
char *option = NULL; char *option = NULL;
@ -1335,10 +1335,12 @@ static void parse_empty_options(const char *value, enum empty_conditions *empty)
*empty = (QUEUE_EMPTY_PENALTY | QUEUE_EMPTY_INVALID); *empty = (QUEUE_EMPTY_PENALTY | QUEUE_EMPTY_INVALID);
} else if (!strcasecmp(option, "strict")) { } else if (!strcasecmp(option, "strict")) {
*empty = (QUEUE_EMPTY_PENALTY | QUEUE_EMPTY_INVALID | QUEUE_EMPTY_PAUSED | QUEUE_EMPTY_UNAVAILABLE); *empty = (QUEUE_EMPTY_PENALTY | QUEUE_EMPTY_INVALID | QUEUE_EMPTY_PAUSED | QUEUE_EMPTY_UNAVAILABLE);
} else if (ast_false(option)) { } else if ((ast_false(option) && joinempty) || (ast_true(option) && !joinempty)) {
*empty = (QUEUE_EMPTY_PENALTY | QUEUE_EMPTY_INVALID | QUEUE_EMPTY_PAUSED); *empty = (QUEUE_EMPTY_PENALTY | QUEUE_EMPTY_INVALID | QUEUE_EMPTY_PAUSED);
} else if (ast_true(option)) { } else if ((ast_false(option) && !joinempty) || (ast_true(option) && joinempty)) {
*empty = 0; *empty = 0;
} else {
ast_log(LOG_WARNING, "Unknown option %s for '%s'\n", option, joinempty ? "joinempty" : "leavewhenempty");
} }
} }
} }
@ -1503,9 +1505,9 @@ static void queue_set_param(struct call_queue *q, const char *param, const char
} }
q->strategy = strategy; q->strategy = strategy;
} else if (!strcasecmp(param, "joinempty")) { } else if (!strcasecmp(param, "joinempty")) {
parse_empty_options(val, &q->joinempty); parse_empty_options(val, &q->joinempty, 1);
} else if (!strcasecmp(param, "leavewhenempty")) { } else if (!strcasecmp(param, "leavewhenempty")) {
parse_empty_options(val, &q->leavewhenempty); parse_empty_options(val, &q->leavewhenempty, 0);
} else if (!strcasecmp(param, "eventmemberstatus")) { } else if (!strcasecmp(param, "eventmemberstatus")) {
q->maskmemberstatus = !ast_true(val); q->maskmemberstatus = !ast_true(val);
} else if (!strcasecmp(param, "eventwhencalled")) { } else if (!strcasecmp(param, "eventwhencalled")) {

Write Preview
Loading…
Cancel
Save