diff options
| author | Terry Wilson <twilson@digium.com> | 2011-06-16 22:49:49 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2011-06-16 22:49:49 +0000 |
| commit | 34e2305ae7c6aabdd27ddc454db9449c07845ee1 (patch) | |
| tree | b2aaf8bd69e1f83f2b40fa94e3fddeb927b658b9 /include/asterisk/channel.h | |
| parent | ab0c2cf44187b593cfc0be645a1f2b8b1f3089cb (diff) | |
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
Diffstat (limited to 'include/asterisk/channel.h')
| -rw-r--r-- | include/asterisk/channel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 5798e92bb..031c6f7e9 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -576,10 +576,10 @@ struct ast_channel_tech { /*! \brief Fix up a channel: If a channel is consumed, this is called. Basically update any ->owner links */ int (* const fixup)(struct ast_channel *oldchan, struct ast_channel *newchan); - /*! \brief Set a given option */ + /*! \brief Set a given option. Called with chan locked */ int (* const setoption)(struct ast_channel *chan, int option, void *data, int datalen); - /*! \brief Query a given option */ + /*! \brief Query a given option. Called with chan locked */ int (* const queryoption)(struct ast_channel *chan, int option, void *data, int *datalen); /*! \brief Blind transfer other side (see app_transfer.c and ast_transfer() */ |