kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport of attended transfer queue_log patch from trunk.

Browse Source 
This patch allows for attended transfers to be logged in the
queue_log the same way that blind transfers have always been.

It was decided by popular opinion on the asterisk-dev mailing
list that this should be backported to 1.4. Thanks to everyone
who gave an opinion.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@125530 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-06-26 22:02:55 +00:00
parent 033e0392e7
commit 3d2bc51957
1 changed files with 132 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
apps/app_queue.c
View File

@@ -441,6 +441,8 @@ static AST_LIST_HEAD_STATIC(queues, call_queue);
static int set_member_paused(const char *queuename, const char *interface, int paused); static int set_member_paused(const char *queuename, const char *interface, int paused);
static void queue_transfer_fixup(void *data, struct ast_channel *old_chan, struct ast_channel *new_chan);
static void rr_dep_warning(void) static void rr_dep_warning(void)
{ {
static unsigned int warned = 0; static unsigned int warned = 0;
@@ -2539,6 +2541,96 @@ static int calc_metric(struct call_queue *q, struct member *mem, int pos, struct
} }
return 0; return 0;
} }
struct queue_transfer_ds {
struct queue_ent *qe;
struct member *member;
int starttime;
};
static void queue_transfer_destroy(void *data)
{
struct queue_transfer_ds *qtds = data;
ast_free(qtds);
}
/*! \brief a datastore used to help correctly log attended transfers of queue callers
*/
static const struct ast_datastore_info queue_transfer_info = {
.type = "queue_transfer",
.chan_fixup = queue_transfer_fixup,
.destroy = queue_transfer_destroy,
};
/*! \brief Log an attended transfer when a queue caller channel is masqueraded
*
* When a caller is masqueraded, we want to log a transfer. Fixup time is the closest we can come to when
* the actual transfer occurs. This happens during the masquerade after datastores are moved from old_chan
* to new_chan. This is why new_chan is referenced for exten, context, and datastore information.
*
* At the end of this, we want to remove the datastore so that this fixup function is not called on any
* future masquerades of the caller during the current call.
*/
static void queue_transfer_fixup(void *data, struct ast_channel *old_chan, struct ast_channel *new_chan)
{
struct queue_transfer_ds *qtds = data;
struct queue_ent *qe = qtds->qe;
struct member *member = qtds->member;
int callstart = qtds->starttime;
struct ast_datastore *datastore;
ast_queue_log(qe->parent->name, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld",
new_chan->exten, new_chan->context, (long) (callstart - qe->start),
(long) (time(NULL) - callstart));
if (!(datastore = ast_channel_datastore_find(new_chan, &queue_transfer_info, NULL))) {
ast_log(LOG_WARNING, "Can't find the queue_transfer datastore.\n");
return;
}
ast_channel_datastore_remove(new_chan, datastore);
}
/*! \brief mechanism to tell if a queue caller was atxferred by a queue member.
*
* When a caller is atxferred, then the queue_transfer_info datastore
* is removed from the channel. If it's still there after the bridge is
* broken, then the caller was not atxferred.
*/
static int attended_transfer_occurred(struct ast_channel *chan)
{
return ast_channel_datastore_find(chan, &queue_transfer_info, NULL) ? 0 : 1;
}
/*! \brief create a datastore for storing relevant info to log attended transfers in the queue_log
*/
static void setup_transfer_datastore(struct queue_ent *qe, struct member *member, int starttime)
{
struct ast_datastore *ds;
struct queue_transfer_ds *qtds = ast_calloc(1, sizeof(*qtds));
if (!qtds) {
ast_log(LOG_WARNING, "Memory allocation error!\n");
return;
}
ast_channel_lock(qe->chan);
if (!(ds = ast_channel_datastore_alloc(&queue_transfer_info, NULL))) {
ast_channel_unlock(qe->chan);
ast_log(LOG_WARNING, "Unable to create transfer datastore. queue_log will not show attended transfer\n");
return;
}
qtds->qe = qe;
/* This member is refcounted in try_calling, so no need to add it here, too */
qtds->member = member;
qtds->starttime = starttime;
ds->data = qtds;
ast_channel_datastore_add(qe->chan, ds);
ast_channel_unlock(qe->chan);
}
/*! \brief A large function which calls members, updates statistics, and bridges the caller and a member /*! \brief A large function which calls members, updates statistics, and bridges the caller and a member
* *
* Here is the process of this function * Here is the process of this function
@@ -3013,46 +3105,48 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
if (member->status == AST_DEVICE_NOT_INUSE) if (member->status == AST_DEVICE_NOT_INUSE)
ast_log(LOG_WARNING, "The device state of this queue member, %s, is still 'Not in Use' when it probably should not be! Please check UPGRADE.txt for correct configuration settings.\n", member->membername); ast_log(LOG_WARNING, "The device state of this queue member, %s, is still 'Not in Use' when it probably should not be! Please check UPGRADE.txt for correct configuration settings.\n", member->membername);
setup_transfer_datastore(qe, member, callstart);
bridge = ast_bridge_call(qe->chan,peer, &bridge_config); bridge = ast_bridge_call(qe->chan,peer, &bridge_config);
if (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten)) { if (!attended_transfer_occurred(qe->chan)) {
ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld", if (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten)) {
qe->chan->exten, qe->chan->context, (long) (callstart - qe->start), ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld",
(long) (time(NULL) - callstart)); qe->chan->exten, qe->chan->context, (long) (callstart - qe->start),
} else if (qe->chan->_softhangup) { (long) (time(NULL) - callstart));
ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETECALLER", "%ld|%ld|%d", } else if (qe->chan->_softhangup) {
(long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos); ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETECALLER", "%ld|%ld|%d",
if (qe->parent->eventwhencalled) (long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos);
manager_event(EVENT_FLAG_AGENT, "AgentComplete", if (qe->parent->eventwhencalled)
"Queue: %s\r\n" manager_event(EVENT_FLAG_AGENT, "AgentComplete",
"Uniqueid: %s\r\n" "Queue: %s\r\n"
"Channel: %s\r\n" "Uniqueid: %s\r\n"
"Member: %s\r\n" "Channel: %s\r\n"
"MemberName: %s\r\n" "Member: %s\r\n"
"HoldTime: %ld\r\n" "MemberName: %s\r\n"
"TalkTime: %ld\r\n" "HoldTime: %ld\r\n"
"Reason: caller\r\n" "TalkTime: %ld\r\n"
"%s", "Reason: caller\r\n"
queuename, qe->chan->uniqueid, peer->name, member->interface, member->membername, "%s",
(long)(callstart - qe->start), (long)(time(NULL) - callstart), queuename, qe->chan->uniqueid, peer->name, member->interface, member->membername,
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : ""); (long)(callstart - qe->start), (long)(time(NULL) - callstart),
} else { qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETEAGENT", "%ld|%ld|%d", } else {
(long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos); ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETEAGENT", "%ld|%ld|%d",
if (qe->parent->eventwhencalled) (long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos);
manager_event(EVENT_FLAG_AGENT, "AgentComplete", if (qe->parent->eventwhencalled)
"Queue: %s\r\n" manager_event(EVENT_FLAG_AGENT, "AgentComplete",
"Uniqueid: %s\r\n" "Queue: %s\r\n"
"Channel: %s\r\n" "Uniqueid: %s\r\n"
"MemberName: %s\r\n" "Channel: %s\r\n"
"HoldTime: %ld\r\n" "MemberName: %s\r\n"
"TalkTime: %ld\r\n" "HoldTime: %ld\r\n"
"Reason: agent\r\n" "TalkTime: %ld\r\n"
"%s", "Reason: agent\r\n"
queuename, qe->chan->uniqueid, peer->name, member->membername, (long)(callstart - qe->start), "%s",
(long)(time(NULL) - callstart), queuename, qe->chan->uniqueid, peer->name, member->membername, (long)(callstart - qe->start),
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : ""); (long)(time(NULL) - callstart),
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
}
} }
if (bridge != AST_PBX_NO_HANGUP_PEER) if (bridge != AST_PBX_NO_HANGUP_PEER)