dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 325610 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r325610 | rmudgett | 2011-06-29 13:05:15 -0500 (Wed, 29 Jun 2011) | 18 lines
  
  Response to QueueRule manager command does not contain ActionID if it was specified.
  
  * Add ActionID support as documented for the QueueRule AMI action.
  
  * Remove documentation for ActionID with the Queues AMI action.  The
  output does not follow normal AMI response output and there is no place to
  put an ActionID header.
  
  (closes issue AST-602)
  Reported by: Vlad Povorozniuc
  Patches:
        jira_ast_602_v1.8.patch (license #5621) patch uploaded by rmudgett
  Tested by: Vlad Povorozniuc, rmudgett
  
  Review: https://reviewboard.asterisk.org/r/1295/
  
  JIRA SWP-3575
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@325611 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
rmudgett 2011-06-29 18:07:26 +00:00
parent 3a102b3b9c
commit a949df8393
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/app_queue.c
View File

@ -695,7 +695,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
Queues.
</synopsis>
<syntax>
<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
<description>
</description>
@ -7259,9 +7258,15 @@ static int manager_queues_show(struct mansession *s, const struct message *m)
static int manager_queue_rule_show(struct mansession *s, const struct message *m)
{
const char *rule = astman_get_header(m, "Rule");
const char *id = astman_get_header(m, "ActionID");
struct rule_list *rl_iter;
struct penalty_rule *pr_iter;
astman_append(s, "Response: Success\r\n");
if (!ast_strlen_zero(id)) {
astman_append(s, "ActionID: %s\r\n", id);
}
AST_LIST_LOCK(&rule_lists);
AST_LIST_TRAVERSE(&rule_lists, rl_iter, list) {
if (ast_strlen_zero(rule) || !strcasecmp(rule, rl_iter->name)) {
@ -7275,6 +7280,10 @@ static int manager_queue_rule_show(struct mansession *s, const struct message *m
}
AST_LIST_UNLOCK(&rule_lists);
/*
* Two blank lines instead of one because the Response and
* ActionID headers used to not be present.
*/
astman_append(s, "\r\n\r\n");
return RESULT_SUCCESS;