Merged revisions 90145 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 29 Nov 2007 00:28:10 +0000 (00:28 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 29 Nov 2007 00:28:10 +0000 (00:28 +0000)
commit53a5f2284963bd60a912f332d379c6c7fc3e06f3
tree210d7ee2d2606a92c83abe9cbc972f9cb8ec96e1
parent8a3e984b0c4c681909f8b8940d020a4e1141e9a3
Merged revisions 90145 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r90145 | russell | 2007-11-28 18:20:34 -0600 (Wed, 28 Nov 2007) | 5 lines

This set of changes is to make some callerID handling thread-safe.
The ast_set_callerid() function needed to lock the channel.  Also, the handlers
for the CALLERID() dialplan function needed to lock the channel when reading
or writing callerid values directly on the channel structure.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
funcs/func_callerid.c
include/asterisk/channel.h
main/channel.c