From: Niklas Larsson <niklas@tese.se>
Date: Thu, 29 Jun 2017 08:47:41 +0000 (+0200)
Subject: app_queue: Add priority to AMI QueueStatus
X-Git-Tag: 13.18.0-rc1~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a09f7dd5dc62587ae472c9a2ab2b1af9ac18ed0;p=thirdparty%2Fasterisk.git

app_queue: Add priority to AMI QueueStatus

Add priority to callers in AMI QueueStatus response

ASTERISK-27092 #close

Change-Id: I8d1f737a72c7c38f4cfe1a4ee3ecc0a4f85bd199
---

diff --git a/CHANGES b/CHANGES
index be4cadb526..c56d7f0afe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -39,9 +39,15 @@ res_musiconhold
    which sends signals to the application and its descendants directly, or
    "process" which sends signals only to the application itself.
 
+res_pjsip
+------------------
  * New dialplan function PJSIP_DTMF_MODE added to get or change the DTMF mode
    of a channel on a per-call basis.
 
+app_queue
+------------------
+ * Add priority to callers in AMI QueueStatus response.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 13.16.0 to Asterisk 13.17.0 ----------
 ------------------------------------------------------------------------------
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 0d9b2f1943..91c8d61fcb 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -9695,6 +9695,7 @@ static int manager_queues_status(struct mansession *s, const struct message *m)
 					"ConnectedLineNum: %s\r\n"
 					"ConnectedLineName: %s\r\n"
 					"Wait: %ld\r\n"
+					"Priority: %d\r\n"
 					"%s"
 					"\r\n",
 					q->name, pos++, ast_channel_name(qe->chan), ast_channel_uniqueid(qe->chan),
@@ -9702,7 +9703,7 @@ static int manager_queues_status(struct mansession *s, const struct message *m)
 					S_COR(ast_channel_caller(qe->chan)->id.name.valid, ast_channel_caller(qe->chan)->id.name.str, "unknown"),
 					S_COR(ast_channel_connected(qe->chan)->id.number.valid, ast_channel_connected(qe->chan)->id.number.str, "unknown"),
 					S_COR(ast_channel_connected(qe->chan)->id.name.valid, ast_channel_connected(qe->chan)->id.name.str, "unknown"),
-					(long) (now - qe->start), idText);
+					(long) (now - qe->start), qe->prio, idText);
 				++q_items;
 			}
 		}
diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h
index afd9ca1484..a9e960c747 100644
--- a/include/asterisk/manager.h
+++ b/include/asterisk/manager.h
@@ -54,7 +54,7 @@
 - \ref manager.c Main manager code file
  */
 
-#define AMI_VERSION                     "2.10.0"
+#define AMI_VERSION                     "2.10.1"
 #define DEFAULT_MANAGER_PORT 5038	/* Default port for Asterisk management via TCP */
 #define DEFAULT_MANAGER_TLS_PORT 5039	/* Default port for Asterisk management via TCP */