kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

app_queue: Evaluate realtime queues when running dialplan functions

Browse Source 
ASTERISK-19103 #close
Reported by: Jim Van Meggelen

Change-Id: I4bd32a9d1fcebb8ac56bff0e084d4f53e31b692b
This commit is contained in:
Sean Bright
2017-08-24 10:42:24 -04:00
parent e8cfd5a80f
commit 579d4593ac
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/app_queue.c
View File

@@ -7460,12 +7460,10 @@ static int set_member_value(const char *queuename, const char *interface, int pr
static int get_member_penalty(char *queuename, char *interface)
{
int foundqueue = 0, penalty;
struct call_queue *q, tmpq = {
.name = queuename,
};
struct call_queue *q;
struct member *mem;
if ((q = ao2_t_find(queues, &tmpq, OBJ_POINTER, "Search for queue"))) {
if ((q = find_load_queue_rt_friendly(queuename))) {
foundqueue = 1;
ao2_lock(q);
if ((mem = interface_exists(q, interface))) {
@@ -8216,10 +8214,7 @@ stop:
static int queue_function_var(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
{
int res = -1;
struct call_queue *q, tmpq = {
.name = data,
};
struct call_queue *q;
char interfacevar[256] = "";
float sl = 0;
@@ -8228,7 +8223,7 @@ static int queue_function_var(struct ast_channel *chan, const char *cmd, char *d
return -1;
}
if ((q = ao2_t_find(queues, &tmpq, OBJ_POINTER, "Find for QUEUE() function"))) {
if ((q = find_load_queue_rt_friendly(data))) {
ao2_lock(q);
if (q->setqueuevar) {
sl = 0;
@@ -8547,9 +8542,7 @@ static int queue_function_queuewaitingcount(struct ast_channel *chan, const char
/*! \brief Dialplan function QUEUE_MEMBER_LIST() Get list of members in a specific queue */
static int queue_function_queuememberlist(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
{
struct call_queue *q, tmpq = {
.name = data,
};
struct call_queue *q;
struct member *m;
/* Ensure an otherwise empty list doesn't return garbage */
@@ -8560,7 +8553,7 @@ static int queue_function_queuememberlist(struct ast_channel *chan, const char *
return -1;
}
if ((q = ao2_t_find(queues, &tmpq, OBJ_POINTER, "Find for QUEUE_MEMBER_LIST()"))) {
if ((q = find_load_queue_rt_friendly(data))) {
int buflen = 0, count = 0;
struct ao2_iterator mem_iter;