From b4fee3666bae7c43b09de61c74952a121f45f114 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Mon, 24 Nov 2014 20:26:37 +0000 Subject: [PATCH] DTMF hooks: Leaving channels need to push any collected digits into the bridge. Any partially collected DTMF digits for a DTMF hook need to be pushed into the bridge when a channel leaves the bridging system as if there were a timeout. Review: https://reviewboard.asterisk.org/r/4199/ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@428601 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/bridge.c | 4 ++-- main/bridge_channel.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/main/bridge.c b/main/bridge.c index 6213392467..1a86a75400 100644 --- a/main/bridge.c +++ b/main/bridge.c @@ -1754,8 +1754,8 @@ int ast_bridge_depart(struct ast_channel *chan) } /* - * We are claiming the reference held by the depart bridge - * channel thread. + * We are claiming the bridge_channel reference held by + * bridge_channel_depart_thread(). */ ast_bridge_channel_leave_bridge(bridge_channel, diff --git a/main/bridge_channel.c b/main/bridge_channel.c index 53bee46184..41813f5a0a 100644 --- a/main/bridge_channel.c +++ b/main/bridge_channel.c @@ -2540,10 +2540,15 @@ int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel) ast_bridge_unlock(bridge_channel->bridge); bridge_channel_event_join_leave(bridge_channel, AST_BRIDGE_HOOK_TYPE_JOIN); + while (bridge_channel->state == BRIDGE_CHANNEL_STATE_WAIT) { /* Wait for something to do. */ bridge_channel_wait(bridge_channel); } + + /* Force a timeout on any accumulated DTMF hook digits. */ + ast_bridge_channel_feature_digit(bridge_channel, 0); + bridge_channel_event_join_leave(bridge_channel, AST_BRIDGE_HOOK_TYPE_LEAVE); ast_bridge_channel_lock_bridge(bridge_channel); } -- 2.47.2