Merged revisions 324048 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Thu, 16 Jun 2011 22:49:49 +0000 (22:49 +0000)
committerTerry Wilson <twilson@digium.com>
Thu, 16 Jun 2011 22:49:49 +0000 (22:49 +0000)
commit34e2305ae7c6aabdd27ddc454db9449c07845ee1
treeb2aaf8bd69e1f83f2b40fa94e3fddeb927b658b9
parentab0c2cf44187b593cfc0be645a1f2b8b1f3089cb
Merged revisions 324048 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r324048 | twilson | 2011-06-16 17:35:41 -0500 (Thu, 16 Jun 2011) | 8 lines

  Lock the channel before calling the setoption callback

  The channel needs to be locked before calling these callback functions. Also,
  sip_setoption needs to lock the pvt and a check p->rtp is non-null before using
  it.

  Review: https://reviewboard.asterisk.org/r/1220/
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_local.c
channels/chan_sip.c
include/asterisk/channel.h
main/channel.c