From: Matthew Nicholson <mnicholson@digium.com>
Date: Wed, 12 Aug 2009 23:16:20 +0000 (+0000)
Subject: Merged revisions 211957 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c949b41e67acd06234b2ed9a58326e3bb94906c3;p=thirdparty%2Fasterisk.git

Merged revisions 211957 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r211957 | mnicholson | 2009-08-12 18:14:36 -0500 (Wed, 12 Aug 2009) | 17 lines

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

  ........
    r211953 | mnicholson | 2009-08-12 18:04:02 -0500 (Wed, 12 Aug 2009) | 10 lines

    This patch adds additional checking when generating queue log TRANSFER events.

    The additional checks prevent generation of false TRANSFER events in certain situations.

    (closes issue #14536)
    Reported by: aragon
    Patches:
          queue-log-xfer-fix1.diff uploaded by mnicholson (license 96)
    Tested by: aragon, mnicholson
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@211958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 5f12fb668e..71526a9cf1 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -4020,7 +4020,9 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
 		ast_channel_lock(qe->chan);
 		if (!attended_transfer_occurred(qe->chan)) {
 			struct ast_datastore *tds;
-			if (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten)) {
+
+			/* detect a blind transfer */
+			if (!(qe->chan->_softhangup | peer->_softhangup) && (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten))) {
 				ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld|%d",
 					qe->chan->exten, qe->chan->context, (long) (callstart - qe->start),
 					(long) (time(NULL) - callstart), qe->opos);