[asterisk-commits] mvanbaak: branch 1.6.1 r215464 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mvanbaak
Date: Wed Sep  2 11:01:20 2009
New Revision: 215464

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=215464
Log:
Merged revisions 215462 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r215462 | mvanbaak | 2009-09-02 17:56:46 +0200 (Wed, 02 Sep 2009) | 12 lines
  
  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:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

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

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=215464&r1=215463&r2=215464
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Wed Sep  2 11:01:20 2009
@@ -5957,6 +5957,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)
@@ -17357,6 +17359,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