[svn-commits] mmichelson: branch 1.6.0 r125588 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Jun 26 18:04:12 2008
New Revision: 125588

URL: http://svn.digium.com/view/asterisk?view=rev&rev=125588
Log:
Merged revisions 125586 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r125586 | mmichelson | 2008-06-26 18:01:02 -0500 (Thu, 26 Jun 2008) | 19 lines

Merged revisions 125585 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r125585 | mmichelson | 2008-06-26 17:52:39 -0500 (Thu, 26 Jun 2008) | 11 lines

Add the interface of a queue member to the output of the "queue show" command
so that it can easily be associated with a queue member's name. This helps
so that the appropriate queue member can be removed or paused since the 
interface is required, not the member's name.

(closes issue #12783)
Reported by: davevg
Patches:
      app_queue.diff uploaded by davevg (license 209) with small mod from me


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_queue.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=125588&r1=125587&r2=125588
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Thu Jun 26 18:04:12 2008
@@ -5409,6 +5409,9 @@
 			mem_iter = ao2_iterator_init(q->members, 0);
 			while ((mem = ao2_iterator_next(&mem_iter))) {
 				ast_str_set(&out, 0, "      %s", mem->membername);
+				if (strcasecmp(mem->membername, mem->interface)) {
+					ast_build_string(&max, &max_left, " (%s)", mem->interface);
+				}
 				if (mem->penalty)
 					ast_str_append(&out, 0, " with penalty %d", mem->penalty);
 				ast_str_append(&out, 0, "%s%s%s (%s)",