- dynamically allocate the ast_jb structure that is on the channel structure

so that channels not using a jitterbuffer don't waste as much memory
- ensure that the channel drivers that use jitterbuffers can handle a failure
  from configuring a jitterbuffer on a new channel because of a memory
  allocation error
- On passing through these channel drivers, configure the jitterbuffer before
  starting the PBX thread instead of afterwards. If the pbx fails to start for
  whatever reason, this would have caused a crash.
- Also on passing, move the increase of the usecount to after all of the
  possible failure conditions in the function
- fix a place where ast_update_use_count() was not called
- ensure that the owner channel pointer of the channel pvt strcutures is set to
  NULL in failure conditions


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35553 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-06-22 17:05:17 +00:00
parent cad05d819b
commit 46018d5032
11 changed files with 141 additions and 81 deletions

View File

@@ -202,16 +202,22 @@ int ast_jb_read_conf(struct ast_jb_conf *conf, char *varname, char *value);
*
* Called from a channel driver when a channel is created and its jitterbuffer needs
* to be configured.
*
* \retval 0 success
* \retval -1 failure
*/
void ast_jb_configure(struct ast_channel *chan, const struct ast_jb_conf *conf);
int ast_jb_configure(struct ast_channel *chan, const struct ast_jb_conf *conf);
/*!
* \brief Copies a channel's jitterbuffer configuration.
* \param chan channel.
* \param conf destination.
*
* \retval 0 success
* \retval -1 failure
*/
void ast_jb_get_config(const struct ast_channel *chan, struct ast_jb_conf *conf);
int ast_jb_get_config(const struct ast_channel *chan, struct ast_jb_conf *conf);
#if defined(__cplusplus) || defined(c_plusplus)

View File

@@ -383,7 +383,7 @@ struct ast_channel {
struct ast_channel_spy_list *spies; /*!< Chan Spy stuff */
AST_LIST_ENTRY(ast_channel) chan_list; /*!< For easy linking */
struct ast_jb jb; /*!< The jitterbuffer state */
struct ast_jb *jb; /*!< The jitterbuffer state */
/*! \brief Data stores on the channel */
AST_LIST_HEAD_NOLOCK(datastores, ast_datastore) datastores;