diff options
author | Terry Wilson <twilson@digium.com> | 2010-09-03 23:23:47 +0000 |
---|---|---|
committer | Terry Wilson <twilson@digium.com> | 2010-09-03 23:23:47 +0000 |
commit | 3b5727bf381fcbf349f6eeda400c548af770e472 (patch) | |
tree | bc1e38ee8b14d6d1ace88ae0d931abdc72b4d57e /channels | |
parent | 1b2039e7db668b2747fd1f8f604407144c8105d6 (diff) |
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
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 33cebb804..e56f55126 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); |