[asterisk-commits] mnicholson: branch 1.6.1 r211958 - in /branches/1.6.1: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed Aug 12 18:16:20 2009
New Revision: 211958

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=211958
Log:
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
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_queue.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_queue.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/apps/app_queue.c?view=diff&rev=211958&r1=211957&r2=211958
==============================================================================
--- branches/1.6.1/apps/app_queue.c (original)
+++ branches/1.6.1/apps/app_queue.c Wed Aug 12 18:16:20 2009
@@ -4020,7 +4020,9 @@
 		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);