aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-07 18:20:04 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-07 18:20:04 +0000
commita1147fcf3ed0dcc7bd26eed8f472f890bb56433f (patch)
treee0b68ae62bbf3d2f55feb6312836938173765f38 /apps
parent4f91e656178c75315c96effd49201045b87d2c5c (diff)
Merged revisions 211040 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r211040 | tilghman | 2009-08-07 13:17:41 -0500 (Fri, 07 Aug 2009) | 21 lines Merged revisions 211038 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r211038 | tilghman | 2009-08-07 13:16:28 -0500 (Fri, 07 Aug 2009) | 14 lines QUEUE_MEMBER_LIST _really_ wants the interface name, not the membername. This is a partial revert of revision 82590, which was an attempted cleanup, but in reality, it broke QUEUE_MEMBER_LIST, which has always been intended as a method by which component interfaces could be queried from the queue. Membername isn't useful here, because that field cannot be used to obtain further information about the member. See the documentation on QUEUE_MEMBER_LIST, RemoveQueueMember, QUEUE_MEMBER_PENALTY, and the various AMI commands which take a member argument for further justification. (closes issue #15664) Reported by: rain Patches: app_queue-queue_member_list.diff uploaded by rain (license 327) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@211051 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index e7c25dfb5..bf48336e0 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -5442,8 +5442,8 @@ static int queue_function_queuememberlist(struct ast_channel *chan, const char *
strncat(buf + buflen, ",", len - buflen - 1);
buflen++;
}
- strncat(buf + buflen, m->membername, len - buflen - 1);
- buflen += strlen(m->membername);
+ strncat(buf + buflen, m->interface, len - buflen - 1);
+ buflen += strlen(m->interface);
/* Safeguard against overflow (negative length) */
if (buflen >= len - 2) {
ao2_ref(m, -1);