[Asterisk-code-review] app queue.c: Fix setting QUEUE MEMBER 'paused' and 'ringinuse'. (asterisk[11])
Matt Jordan
asteriskteam at digium.com
Wed Aug 19 08:40:28 CDT 2015
Matt Jordan has submitted this change and it was merged.
Change subject: app_queue.c: Fix setting QUEUE_MEMBER 'paused' and 'ringinuse'.
......................................................................
app_queue.c: Fix setting QUEUE_MEMBER 'paused' and 'ringinuse'.
Setting the 'paused' and 'ringinuse' options on a queue member using the
dialplan function QUEUE_MEMBER did not behave the same way as the
equivalent dialplan applications or AMI actions.
* Made queue_function_mem_write() call the set_member_paused() and
set_member_value() for the 'paused' and 'ringinuse' options respectively.
A beneficial side effect is that the queue name is now optional and sets
the value in all queues the interface is a member.
NOTE: This may fix a consistency issue with the realtime paused setting
since how the value is set is controlled by set_member_paused() which
treats realtime a little better.
* Update QUEUE_MEMBER XML documentation.
* Fix error checking in QUEUE_MEMBER() write.
ASTERISK-25215 #close
Reported by: Lorne Gaetz
Change-Id: I3a016be8dc94d63a9cc155295ff9c9afa5f707cb
---
M apps/app_queue.c
1 file changed, 41 insertions(+), 52 deletions(-)
Approvals:
Mark Michelson: Looks good to me, but someone else must approve
Anonymous Coward #1000019: Verified
Matt Jordan: Looks good to me, approved
Ashley Sanders: Looks good to me, but someone else must approve
diff --git a/apps/app_queue.c b/apps/app_queue.c
index c670f20..3c6d9e0 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -528,7 +528,7 @@
Count number of members answering a queue.
</synopsis>
<syntax>
- <parameter name="queuename" required="true" />
+ <parameter name="queuename" required="false" />
<parameter name="option" required="true">
<enumlist>
<enum name="logged">
@@ -544,13 +544,22 @@
<para>Returns the total number of members for the specified queue.</para>
</enum>
<enum name="penalty">
- <para>Gets or sets queue member penalty.</para>
+ <para>Gets or sets queue member penalty. If
+ <replaceable>queuename</replaceable> is not specified
+ when setting the penalty then the penalty is set in all queues
+ the interface is a member.</para>
</enum>
<enum name="paused">
- <para>Gets or sets queue member paused status.</para>
+ <para>Gets or sets queue member paused status. If
+ <replaceable>queuename</replaceable> is not specified
+ when setting the paused status then the paused status is set
+ in all queues the interface is a member.</para>
</enum>
<enum name="ringinuse">
- <para>Gets or sets queue member ringinuse.</para>
+ <para>Gets or sets queue member ringinuse. If
+ <replaceable>queuename</replaceable> is not specified
+ when setting ringinuse then ringinuse is set
+ in all queues the interface is a member.</para>
</enum>
</enumlist>
</parameter>
@@ -558,10 +567,8 @@
</syntax>
<description>
<para>Allows access to queue counts [R] and member information [R/W].</para>
- <para>
- <replaceable>queuename</replaceable> is required for all operations
- <replaceable>interface</replaceable> is required for all member operations.
- </para>
+ <para><replaceable>queuename</replaceable> is required for all read operations.</para>
+ <para><replaceable>interface</replaceable> is required for all member operations.</para>
</description>
<see-also>
<ref type="application">Queue</ref>
@@ -7493,9 +7500,6 @@
static int queue_function_mem_write(struct ast_channel *chan, const char *cmd, char *data, const char *value)
{
int memvalue;
- struct call_queue *q;
- struct member *m;
- char rtvalue[80];
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(queuename);
@@ -7504,63 +7508,48 @@
);
if (ast_strlen_zero(data)) {
- ast_log(LOG_ERROR, "Missing argument. QUEUE_MEMBER(<queuename>,<option>,<interface>)\n");
+ ast_log(LOG_ERROR,
+ "Missing required argument. %s([<queuename>],<option>,<interface>)\n",
+ cmd);
return -1;
}
AST_STANDARD_APP_ARGS(args, data);
- if (args.argc < 3) {
- ast_log(LOG_ERROR, "Missing argument. QUEUE_MEMBER_PENALTY(<queuename>,<interface>)\n");
+ if (ast_strlen_zero(args.option)
+ || ast_strlen_zero(args.interface)) {
+ ast_log(LOG_ERROR,
+ "Missing required argument. %s([<queuename>],<option>,<interface>)\n",
+ cmd);
return -1;
}
- if (ast_strlen_zero(args.interface) && ast_strlen_zero(args.option)) {
- ast_log (LOG_ERROR, "<interface> and <option> parameter's can't be null\n");
- return -1;
- }
+ /*
+ * If queuename is empty then the option will be
+ * set for the interface in all queues.
+ */
memvalue = atoi(value);
if (!strcasecmp(args.option, "penalty")) {
- /* if queuename = NULL then penalty will be set for interface in all the queues.*/
if (set_member_value(args.queuename, args.interface, MEMBER_PENALTY, memvalue)) {
- ast_log(LOG_ERROR, "Invalid interface, queue or penalty\n");
+ ast_log(LOG_ERROR, "Invalid interface, queue, or penalty\n");
return -1;
}
- } else if ((q = find_load_queue_rt_friendly(args.queuename))) {
- ao2_lock(q);
- if ((m = interface_exists(q, args.interface))) {
- sprintf(rtvalue, "%s",(memvalue <= 0) ? "0" : "1");
- if (!strcasecmp(args.option, "paused")) {
- if (m->realtime) {
- update_realtime_member_field(m, q->name, args.option, rtvalue);
- } else {
- m->paused = (memvalue <= 0) ? 0 : 1;
- }
- } else if ((!strcasecmp(args.option, "ignorebusy")) || (!strcasecmp(args.option, "ringinuse"))) {
- if (m->realtime) {
- update_realtime_member_field(m, q->name, args.option, rtvalue);
- } else {
- m->ringinuse = (memvalue <= 0) ? 0 : 1;
- }
- } else {
- ast_log(LOG_ERROR, "Invalid option, only penalty , paused or ringinuse/ignorebusy are valid\n");
- ao2_ref(m, -1);
- ao2_unlock(q);
- ao2_ref(q, -1);
- return -1;
- }
- ao2_ref(m, -1);
- } else {
- ao2_unlock(q);
- ao2_ref(q, -1);
- ast_log(LOG_ERROR, "Invalid interface for queue\n");
+ } else if (!strcasecmp(args.option, "paused")) {
+ memvalue = (memvalue <= 0) ? 0 : 1;
+ if (set_member_paused(args.queuename, args.interface, NULL, memvalue)) {
+ ast_log(LOG_ERROR, "Invalid interface or queue\n");
return -1;
}
- ao2_unlock(q);
- ao2_ref(q, -1);
- } else {
- ast_log(LOG_ERROR, "Invalid queue\n");
+ } else if (!strcasecmp(args.option, "ignorebusy") /* ignorebusy is legacy */
+ || !strcasecmp(args.option, "ringinuse")) {
+ memvalue = (memvalue <= 0) ? 0 : 1;
+ if (set_member_value(args.queuename, args.interface, MEMBER_RINGINUSE, memvalue)) {
+ ast_log(LOG_ERROR, "Invalid interface or queue\n");
+ return -1;
+ }
+ } else {
+ ast_log(LOG_ERROR, "%s: Invalid option '%s' provided.\n", cmd, args.option);
return -1;
}
return 0;
--
To view, visit https://gerrit.asterisk.org/1102
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a016be8dc94d63a9cc155295ff9c9afa5f707cb
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Ashley Sanders <asanders at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>
More information about the asterisk-code-review
mailing list