diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-01-31 17:26:09 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-01-31 17:26:09 +0000 |
| commit | 2d7a40de5842885dd6a2e892640900c898576eb0 (patch) | |
| tree | c5d85052ffd262dbdf65e7228691c03fd40581db /include | |
| parent | de57235ac6b9c69a8accec36e612a13f61a41c45 (diff) | |
Fix memory leak in error paths for action_originate().
* Fix memory leak of vars in error paths for action_originate().
* Moved struct fast_originate_helper tech and data members to stringfields.
* Simplified ActionID header handling for fast_originate().
* Added doxygen note to ast_request() and ast_call() and the associated
channel callbacks that the data/addr parameters should be treated as const
char *.
Review: https://reviewboard.asterisk.org/r/1690/
........
Merged revisions 353454 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 353463 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@353466 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 91d6990eb..da256fc62 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -516,7 +516,10 @@ struct ast_channel_tech { int properties; /*!< Technology Properties */ - /*! \brief Requester - to set up call data structures (pvt's) */ + /*! + * \brief Requester - to set up call data structures (pvt's) + * \note data should be treated as const char *. + */ struct ast_channel *(* const requester)(const char *type, struct ast_format_cap *cap, const struct ast_channel *requestor, void *data, int *cause); int (* const devicestate)(void *data); /*!< Devicestate call back */ @@ -535,8 +538,11 @@ struct ast_channel_tech { */ int (* const send_digit_end)(struct ast_channel *chan, char digit, unsigned int duration); - /*! \brief Call a given phone number (address, etc), but don't - * take longer than timeout seconds to do so. */ + /*! + * \brief Call a given phone number (address, etc), but don't + * take longer than timeout seconds to do so. + * \note addr should be treated as const char *. + */ int (* const call)(struct ast_channel *chan, char *addr, int timeout); /*! \brief Hangup (and possibly destroy) the channel */ @@ -1296,7 +1302,7 @@ struct ast_channel *ast_channel_release(struct ast_channel *chan); * \param type type of channel to request * \param format capabilities for requested channel * \param requestor channel asking for data - * \param data data to pass to the channel requester + * \param data data to pass to the channel requester (Should be treated as const char *) * \param status status * * \details @@ -1617,7 +1623,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay, int cdr_answer); * \brief Make a call * \note Absolutely _NO_ channel locks should be held before calling this function. * \param chan which channel to make the call on - * \param addr destination of the call + * \param addr destination of the call (Should be treated as const char *) * \param timeout time to wait on for connect * \details * Place a call, take no longer than timeout ms. |