diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-12-12 13:55:30 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-12-12 13:55:30 +0000 |
| commit | 7fcac067b2efca15bfd6e2ed8aec3d16165f23c3 (patch) | |
| tree | 143f7c7d4409292fc6d174119b3557cfc70875ef /include/asterisk/channel.h | |
| parent | 592cab82026262bec92a6dec80a4d53cb13d1aa1 (diff) | |
Merged revisions 163448 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r163448 | russell | 2008-12-12 07:44:08 -0600 (Fri, 12 Dec 2008) | 26 lines
Resolve issues that could cause DTMF to be processed out of order.
These changes come from team/russell/issue_12658
1) Change autoservice to put digits on the head of the channel's frame readq
instead of the tail. If there were frames on the readq that autoservice
had not yet read, the previous code would have resulted in out of order
processing. This required a new API call to queue a frame to the head
of the queue instead of the tail.
2) Change up the processing of DTMF in ast_read(). Some of the problems
were the result of having two sources of pending DTMF frames. There
was the dtmfq and the more generic readq. Both were used for pending
DTMF in various scenarios. Simplifying things to only use the frame
readq avoids some of the problems.
3) Fix a bug where a DTMF END frame could get passed through when it
shouldn't have. If code set END_DTMF_ONLY in the middle of digit emulation,
and a digit arrived before emulation was complete, digits would get
processed out of order.
(closes issue #12658)
Reported by: dimas
Tested by: russell, file
Review: http://reviewboard.digium.com/r/85/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@163449 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/channel.h')
| -rw-r--r-- | include/asterisk/channel.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index ae785a298..93ef1f1b6 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -496,7 +496,7 @@ struct ast_channel { unsigned short transfercapability; /*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */ - char dtmfq[AST_MAX_EXTENSION]; /*!< Any/all queued DTMF characters */ + char unused_old_dtmfq[AST_MAX_EXTENSION]; /*!< (deprecated, use readq instead) Any/all queued DTMF characters */ char context[AST_MAX_CONTEXT]; /*!< Dialplan: Current extension context */ char exten[AST_MAX_EXTENSION]; /*!< Dialplan: Current extension number */ char macrocontext[AST_MAX_CONTEXT]; /*!< Macro: Current non-macro context. See app_macro.c */ @@ -711,6 +711,20 @@ struct ast_channel *ast_channel_alloc(int needqueue, int state, const char *cid_ */ int ast_queue_frame(struct ast_channel *chan, struct ast_frame *f); +/*! + * \brief Queue an outgoing frame to the head of the frame queue + * + * \param chan the channel to queue the frame on + * \param f the frame to queue. Note that this frame will be duplicated by + * this function. It is the responsibility of the caller to handle + * freeing the memory associated with the frame being passed if + * necessary. + * + * \retval 0 success + * \retval non-zero failure + */ +int ast_queue_frame_head(struct ast_channel *chan, struct ast_frame *f); + /*! * \brief Queue a hangup frame * |