diff options
author | George Joseph <gjoseph@digium.com> | 2016-11-16 17:45:16 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-11-16 17:45:16 -0600 |
commit | 97b2ba472d64147fc7790126bda95c9f63445c66 (patch) | |
tree | 775c242007381eb57a8a671c30146c2cd15d48d2 /include/asterisk/channel.h | |
parent | b8e91bb9cc3b92266c091d9e56ad2dd18b9fcffc (diff) | |
parent | 7263a17ca046923c245296a3cee21df0e4bd499a (diff) |
Merge "channel: Fix issues in hangup scenarios caused by frame deferral"
Diffstat (limited to 'include/asterisk/channel.h')
-rw-r--r-- | include/asterisk/channel.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 300196648..5c73c777e 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -972,6 +972,11 @@ enum { * frames should be deferred. */ AST_FLAG_DEFER_FRAMES = (1 << 28), + /*! + * The channel is currently deferring hangup frames + * in addition to other frame types. + */ + AST_FLAG_DEFER_HANGUP_FRAMES = (1 << 29), }; /*! \brief ast_bridge_config flags */ @@ -4720,11 +4725,17 @@ struct ast_readq_list *ast_channel_deferred_readq(struct ast_channel *chan); * drop important frames. This function can be called so that important frames * will be deferred, rather than placed in the channel frame queue as normal. * + * Hangups are an interesting frame type. Hangups will always be detectable by + * a reader when a channel is deferring frames. If the defer_hangups parameter + * is non-zero, then the hangup frame will also be duplicated and deferred, so + * that the next reader of the channel will get the hangup frame, too. + * * \pre chan MUST be locked before calling * * \param chan The channel on which frames should be deferred + * \param defer_hangups Defer hangups in addition to other deferrable frames */ -void ast_channel_start_defer_frames(struct ast_channel *chan); +void ast_channel_start_defer_frames(struct ast_channel *chan, int defer_hangups); /*! * \brief Stop deferring deferrable frames on this channel |