diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-29 00:28:10 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-29 00:28:10 +0000 |
| commit | 4efbdfc704f10aac8f3a9284ae8e69dddd1ea3b5 (patch) | |
| tree | 210d7ee2d2606a92c83abe9cbc972f9cb8ec96e1 /include | |
| parent | 633b7b4f97532d6bcfe9c26a3bb3183118ce7a6e (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@90146 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index ad4e735b8..4bf33d7bd 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1309,7 +1309,11 @@ int ast_activate_generator(struct ast_channel *chan, struct ast_generator *gen, /*! Deactivate an active generator */ void ast_deactivate_generator(struct ast_channel *chan); -/*! Set caller ID number, name and ANI */ +/*! + * \brief Set caller ID number, name and ANI + * + * \note The channel does not need to be locked before calling this function. + */ void ast_set_callerid(struct ast_channel *chan, const char *cid_num, const char *cid_name, const char *cid_ani); /*! Set the file descriptor on the channel */ |