diff options
author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-06-23 18:26:09 +0000 |
---|---|---|
committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-06-23 18:26:09 +0000 |
commit | 9cead6b7f89547c0b1a323bb206042c212b9c232 (patch) | |
tree | 915035c5ccad04222b4618fc9ac9c7a920c840ee /include/asterisk | |
parent | 800a5dfd4e7e7e26ed48231c8d7413e19d8858d2 (diff) |
Merged revisions 324652 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r324652 | dvossel | 2011-06-23 13:23:21 -0500 (Thu, 23 Jun 2011) | 20 lines
Merged revisions 324634 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r324634 | dvossel | 2011-06-23 13:18:46 -0500 (Thu, 23 Jun 2011) | 13 lines
Merged revisions 324627 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r324627 | dvossel | 2011-06-23 13:16:52 -0500 (Thu, 23 Jun 2011) | 7 lines
Addresses AST-2011-010, remote crash in IAX2 driver
Thanks to twilson for identifying the issue and providing the patches.
AST-2011-010
........
................
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@324664 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
-rw-r--r-- | include/asterisk/frame.h | 66 |
1 files changed, 41 insertions, 25 deletions
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h index 8189c648c..6e8c17779 100644 --- a/include/asterisk/frame.h +++ b/include/asterisk/frame.h @@ -334,45 +334,51 @@ enum ast_control_transfer { #define AST_OPTION_FLAG_WTF 6 /*! Verify touchtones by muting audio transmission - (and reception) and verify the tone is still present */ + * (and reception) and verify the tone is still present + * Option data is a single signed char value 0 or 1 */ #define AST_OPTION_TONE_VERIFY 1 -/*! Put a compatible channel into TDD (TTY for the hearing-impared) mode */ +/*! Put a compatible channel into TDD (TTY for the hearing-impared) mode + * Option data is a single signed char value 0 or 1 */ #define AST_OPTION_TDD 2 -/*! Relax the parameters for DTMF reception (mainly for radio use) */ +/*! Relax the parameters for DTMF reception (mainly for radio use) + * Option data is a single signed char value 0 or 1 */ #define AST_OPTION_RELAXDTMF 3 -/*! Set (or clear) Audio (Not-Clear) Mode */ +/*! Set (or clear) Audio (Not-Clear) Mode + * Option data is a single signed char value 0 or 1 */ #define AST_OPTION_AUDIO_MODE 4 /*! Set channel transmit gain - * Option data is a single signed char - representing number of decibels (dB) - to set gain to (on top of any gain - specified in channel driver) -*/ + * Option data is a single signed char representing number of decibels (dB) + * to set gain to (on top of any gain specified in channel driver) */ #define AST_OPTION_TXGAIN 5 /*! Set channel receive gain - * Option data is a single signed char - representing number of decibels (dB) - to set gain to (on top of any gain - specified in channel driver) -*/ + * Option data is a single signed char representing number of decibels (dB) + * to set gain to (on top of any gain specified in channel driver) */ #define AST_OPTION_RXGAIN 6 -/* set channel into "Operator Services" mode */ +/* set channel into "Operator Services" mode + * Option data is a struct oprmode + * + * \note This option should never be sent over the network */ #define AST_OPTION_OPRMODE 7 -/*! Explicitly enable or disable echo cancelation for the given channel */ +/*! Explicitly enable or disable echo cancelation for the given channel + * Option data is a single signed char value 0 or 1 + * + * \note This option appears to be unused in the code. It is handled, but never + * set or queried. */ #define AST_OPTION_ECHOCAN 8 /*! \brief Handle channel write data * If a channel needs to process the data from a func_channel write operation * after func_channel_write executes, it can define the setoption callback * and process this option. A pointer to an ast_chan_write_info_t will be passed. - * */ + * + * \note This option should never be passed over the network. */ #define AST_OPTION_CHANNEL_WRITE 9 /* ! @@ -381,28 +387,38 @@ enum ast_control_transfer { */ #define AST_OPTION_T38_STATE 10 -/*! Request that the channel driver deliver frames in a specific format */ +/*! Request that the channel driver deliver frames in a specific format + * Option data is a format_t */ #define AST_OPTION_FORMAT_READ 11 -/*! Request that the channel driver be prepared to accept frames in a specific format */ +/*! Request that the channel driver be prepared to accept frames in a specific format + * Option data is a format_t */ #define AST_OPTION_FORMAT_WRITE 12 -/*! Request that the channel driver make two channels of the same tech type compatible if possible */ +/*! Request that the channel driver make two channels of the same tech type compatible if possible + * Option data is an ast_channel + * + * \note This option should never be passed over the network */ #define AST_OPTION_MAKE_COMPATIBLE 13 -/*! Get or set the digit detection state of the channel */ +/*! Get or set the digit detection state of the channel + * Option data is a single signed char value 0 or 1 */ #define AST_OPTION_DIGIT_DETECT 14 -/*! Get or set the fax tone detection state of the channel */ +/*! Get or set the fax tone detection state of the channel + * Option data is a single signed char value 0 or 1 */ #define AST_OPTION_FAX_DETECT 15 -/*! Get the device name from the channel */ +/*! Get the device name from the channel (Read only) + * Option data is a character buffer of suitable length */ #define AST_OPTION_DEVICE_NAME 16 -/*! Get the CC agent type from the channel */ +/*! Get the CC agent type from the channel (Read only) + * Option data is a character buffer of suitable length */ #define AST_OPTION_CC_AGENT_TYPE 17 -/*! Get or set the security options on a channel */ +/*! Get or set the security options on a channel + * Option data is an integer value of 0 or 1 */ #define AST_OPTION_SECURE_SIGNALING 18 #define AST_OPTION_SECURE_MEDIA 19 |