]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 215462 via svnmerge from
authorMichiel van Baak <michiel@vanbaak.info>
Wed, 2 Sep 2009 16:01:20 +0000 (16:01 +0000)
committerMichiel van Baak <michiel@vanbaak.info>
Wed, 2 Sep 2009 16:01:20 +0000 (16:01 +0000)
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
........

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

channels/chan_sip.c

index 45446bfe8a1e5a654ce551a6a4d89611cd79a322..9b60775ad953196c7a6297582e260ec086615672 100644 (file)
@@ -5957,6 +5957,8 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit
        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 @@ static int sip_park(struct ast_channel *chan1, struct ast_channel *chan2, struct
        /* 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