From: Terry Wilson Date: Fri, 3 Sep 2010 23:23:47 +0000 (+0000) Subject: Merged revisions 285017 via svnmerge from X-Git-Tag: 11.0.0-beta1~2374 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b5727bf381fcbf349f6eeda400c548af770e472;p=thirdparty%2Fasterisk.git Merged revisions 285017 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r285017 | twilson | 2010-09-03 18:19:54 -0500 (Fri, 03 Sep 2010) | 4 lines Call correct lock function as transferer is a sip_pvt not a channel Both functions are #defined to ao2_lock, but still... ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285029 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 33cebb804a..e56f55126a 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -21767,7 +21767,7 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual * ast_do_masquerade(target.chan1); - ast_channel_lock(transferer); /* the transferer pvt is expected to remain locked on return */ + sip_pvt_lock(transferer); /* the transferer pvt is expected to remain locked on return */ ast_indicate(target.chan1, AST_CONTROL_UNHOLD);