[svn-commits] mmichelson: branch 1.6.0 r131301 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jul 16 13:59:59 2008
New Revision: 131301

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

................
r131300 | mmichelson | 2008-07-16 13:59:27 -0500 (Wed, 16 Jul 2008) | 21 lines

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

........
r131299 | mmichelson | 2008-07-16 13:57:34 -0500 (Wed, 16 Jul 2008) | 13 lines

Make absolutely certain that the transfer datastore
is removed from the calling channel once the caller
is finished in the queue. This could have weird con-
sequences when dialing local queue members when multiple
transfers occur on a single call.

Also fixed a memory leak that would occur when an
attended transfer occurred from a queue member.

(closes issue #13047)
Reported by: festr


........

................

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

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

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=131301&r1=131300&r2=131301
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Wed Jul 16 13:59:59 2008
@@ -3045,7 +3045,7 @@
 	struct member *member = qtds->member;
 	int callstart = qtds->starttime;
 	struct ast_datastore *datastore;
-	
+
 	ast_queue_log(qe->parent->name, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld",
 				new_chan->exten, new_chan->context, (long) (callstart - qe->start),
 				(long) (time(NULL) - callstart));
@@ -3056,6 +3056,7 @@
 	}
 
 	ast_channel_datastore_remove(new_chan, datastore);
+	ast_channel_datastore_free(datastore);
 }
 
 /*! \brief mechanism to tell if a queue caller was atxferred by a queue member.
@@ -3746,6 +3747,7 @@
 		 * when the masquerade occurred. These other "ending" queue_log messages are unnecessary
 		 */
 		if (!attended_transfer_occurred(qe->chan)) {
+			struct ast_datastore *transfer_ds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL);
 			if (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten)) {
 				ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld",
 					qe->chan->exten, qe->chan->context, (long) (callstart - qe->start),
@@ -3759,6 +3761,12 @@
 				ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETEAGENT", "%ld|%ld|%d",
 					(long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos);
 				send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), AGENT);
+			}
+			if (transfer_ds) {
+				ast_channel_lock(qe->chan);
+				ast_channel_datastore_remove(qe->chan, transfer_ds);
+				ast_channel_datastore_free(transfer_ds);
+				ast_channel_unlock(qe->chan);
 			}
 		}