[asterisk-commits] mnicholson: branch 1.6.2 r272369 - in /branches/1.6.2: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed Jun 23 17:37:24 2010
New Revision: 272369

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=272369
Log:
Merged revisions 272368 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r272368 | mnicholson | 2010-06-23 17:36:49 -0500 (Wed, 23 Jun 2010) | 16 lines
  
  Merged revisions 272367 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  This version of the patch only adds AgentComplete for attended transfers.  It was already present for blind transfers.
  
  ........
    r272367 | mnicholson | 2010-06-23 17:33:51 -0500 (Wed, 23 Jun 2010) | 8 lines
    
    Send AgentComplete manager events in the event of blind and attended transfers.
    
    (closes issue #16819)
    Reported by: elbriga
    Patches:
          app_queue.diff uploaded by elbriga (license 482)
  ........
................

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

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

Modified: branches/1.6.2/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_queue.c?view=diff&rev=272369&r1=272368&r2=272369
==============================================================================
--- branches/1.6.2/apps/app_queue.c (original)
+++ branches/1.6.2/apps/app_queue.c Wed Jun 23 17:37:24 2010
@@ -4274,7 +4274,8 @@
 		bridge = ast_bridge_call(qe->chan,peer, &bridge_config);
 
 		/* If the queue member did an attended transfer, then the TRANSFER already was logged in the queue_log
-		 * when the masquerade occurred. These other "ending" queue_log messages are unnecessary
+		 * when the masquerade occurred. These other "ending" queue_log messages are unnecessary, except for
+		 * the AgentComplete manager event
 		 */
 		ast_channel_lock(qe->chan);
 		if (!attended_transfer_occurred(qe->chan)) {
@@ -4299,6 +4300,9 @@
 				ast_channel_datastore_remove(qe->chan, tds);
 			}
 			update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart));
+		} else {
+			/* We already logged the TRANSFER on the queue_log, but we still need to send the AgentComplete event */
+			send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), TRANSFER);
 		}
 
 		if (transfer_ds) {