Merged revisions 211953 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Wed, 12 Aug 2009 23:14:36 +0000 (23:14 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Wed, 12 Aug 2009 23:14:36 +0000 (23:14 +0000)
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/trunk@211957 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_queue.c

index dedf489..cc1fc18 100644 (file)
@@ -4522,7 +4522,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;
                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);
                                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);