diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-03-14 22:38:29 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-03-14 22:38:29 +0000 |
| commit | 9b31bd3cd83b50e0843f42b70d5e111287fa8107 (patch) | |
| tree | 6f9fad87dcbdc947019dd82f930bb310f9df688a /include | |
| parent | a699bb72ad8d255c84998e97addd2e20ab3f6b7b (diff) | |
Fix deadlock potential with some ast_indicate/ast_indicate_data calls.
Calling ast_indicate()/ast_indicate_data() with the channel lock held can
result in a deadlock with a local channel because of how local channels
need to avoid deadlock.
........
Merged revisions 359451 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 359453 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@359455 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 292640bb4..8e438bbd5 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1525,6 +1525,7 @@ int ast_call(struct ast_channel *chan, const char *addr, int timeout); /*! * \brief Indicates condition of channel + * \note Absolutely _NO_ channel locks should be held before calling this function. * \note Indicate a condition such as AST_CONTROL_BUSY, AST_CONTROL_RINGING, or AST_CONTROL_CONGESTION on a channel * \param chan channel to change the indication * \param condition which condition to indicate on the channel @@ -1534,6 +1535,7 @@ int ast_indicate(struct ast_channel *chan, int condition); /*! * \brief Indicates condition of channel, with payload + * \note Absolutely _NO_ channel locks should be held before calling this function. * \note Indicate a condition such as AST_CONTROL_HOLD with payload being music on hold class * \param chan channel to change the indication * \param condition which condition to indicate on the channel |