diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-08-23 18:33:36 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-08-23 18:33:36 +0000 |
| commit | 6ebfac8e70b0863fd96ee4fe6ca4b254696fe9c4 (patch) | |
| tree | df6a91c733cc32ae5179493b800384824dcdcfa3 /include/asterisk/bridge_channel.h | |
| parent | 31ab4866275aa28f6ec9fe7ce166b4f86f8ecf24 (diff) | |
Handle DTMF and hold wrapup when a channel leaves the bridging system.
DTMF start/end and hold/unhold events have state because a DTMF begin
event and hold event must be ended by something.
The following cases need to be handled when a channel is moved around in
the system.
* When a channel leaves a bridge it may owe a DTMF end event to the
bridge.
* When a channel leaves a bridge it may owe an UNHOLD event to the bridge.
(This case is explicitly ignored because things like transfers need
explicit control over this.)
* When a channel leaves the bridging system it may need to simulate a DTMF
end event to the channel.
* When a channel leaves the bridging system it may need to simulate an
UNHOLD event to the channel.
The patch also fixes the following:
* Fixes playing a file and restarting MOH using the latest MOH class used.
(closes issue ASTERISK-22043)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2791/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397577 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/bridge_channel.h')
| -rw-r--r-- | include/asterisk/bridge_channel.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asterisk/bridge_channel.h b/include/asterisk/bridge_channel.h index ae5131cef..149c8e0d1 100644 --- a/include/asterisk/bridge_channel.h +++ b/include/asterisk/bridge_channel.h @@ -155,6 +155,13 @@ struct ast_bridge_channel { * \note Needs to be atomically settable. */ enum bridge_channel_thread_state activity; + /*! Owed events to the bridge. */ + struct { + /*! Time started sending the current digit. (Invalid if owed.dtmf_digit is zero.) */ + struct timeval dtmf_tv; + /*! Digit currently sending into the bridge. (zero if not sending) */ + char dtmf_digit; + } owed; }; /*! |