]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 272368 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Wed, 23 Jun 2010 22:37:24 +0000 (22:37 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Wed, 23 Jun 2010 22:37:24 +0000 (22:37 +0000)
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)
  ........
................

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

apps/app_queue.c

index 6ba45bf3030f481b04ff0df1cad9c42c9e793897..979ae9c86ac3d6eed194e0bab9b4ff504bb674ca 100644 (file)
@@ -4274,7 +4274,8 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
                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 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
                                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) {