From 54f41f21419347d6b26bce2c73f0420b177a255b Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Thu, 10 Nov 2011 22:34:11 +0000 Subject: [PATCH] Make AMI event AgentCalled get CallerID/ConnectedLine info from the incoming channel. It was strange that the AgentCalled AMI event would get most of its information from the incoming channel but then get the CallerID information from the outgoing channel. Before connected line support was added, this information was always the same at this point. (closes issue ASTERISK-18152) Reported by: Thomas Farnham Tested by: rmudgett git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@344536 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/app_queue.c b/apps/app_queue.c index 9285664e45..9b1c656cff 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3154,10 +3154,10 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies "Uniqueid: %s\r\n" "%s", qe->parent->name, tmp->interface, tmp->member->membername, qe->chan->name, tmp->chan->name, - S_COR(tmp->chan->caller.id.number.valid, tmp->chan->caller.id.number.str, "unknown"), - S_COR(tmp->chan->caller.id.name.valid, tmp->chan->caller.id.name.str, "unknown"), - S_COR(tmp->chan->connected.id.number.valid, tmp->chan->connected.id.number.str, "unknown"), - S_COR(tmp->chan->connected.id.name.valid, tmp->chan->connected.id.name.str, "unknown"), + S_COR(qe->chan->caller.id.number.valid, qe->chan->caller.id.number.str, "unknown"), + S_COR(qe->chan->caller.id.name.valid, qe->chan->caller.id.name.str, "unknown"), + S_COR(qe->chan->connected.id.number.valid, qe->chan->connected.id.number.str, "unknown"), + S_COR(qe->chan->connected.id.name.valid, qe->chan->connected.id.name.str, "unknown"), qe->chan->context, qe->chan->exten, qe->chan->priority, qe->chan->uniqueid, qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : ""); ast_verb(3, "Called %s\n", tmp->interface); -- 2.47.3