[asterisk-commits] mvanbaak: trunk r215462 - /trunk/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mvanbaak
Date: Wed Sep  2 10:56:46 2009
New Revision: 215462

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=215462
Log:
Honor configured parkinglot when parking and retrieving parked calls

Thank oej for pointing out the fact that sip_new did not copy parkinglot from the peer
into the newly created channel.

(closes issue #15538)
Reported by: gracedman
Patches:
      2009090100_sipnewparkinglot-161.diff.txt uploaded by mvanbaak (license 7)
	  With mod by me to also fix callparking as well (this uploaded patch only fixed retrieving a parked call)
Tested by: gracedman, mvanbaak

Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=215462&r1=215461&r2=215462
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Sep  2 10:56:46 2009
@@ -6676,6 +6676,8 @@
 	tmp->callgroup = i->callgroup;
 	tmp->pickupgroup = i->pickupgroup;
 	tmp->cid.cid_pres = i->callingpres;
+	if (!ast_strlen_zero(i->parkinglot))
+		ast_string_field_set(tmp, parkinglot, i->parkinglot);
 	if (!ast_strlen_zero(i->accountcode))
 		ast_string_field_set(tmp, accountcode, i->accountcode);
 	if (i->amaflags)
@@ -19173,6 +19175,8 @@
 	/* Make formats okay */
 	transferer->readformat = chan2->readformat;
 	transferer->writeformat = chan2->writeformat;
+	if (!ast_strlen_zero(chan2->parkinglot))
+		ast_string_field_set(transferer, parkinglot, chan2->parkinglot);
 
 	/* Prepare for taking over the channel.  Go ahead and grab this channel
 	 * lock here to avoid a deadlock with callbacks into the channel driver