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

diff --git a/main/bridge.c b/main/bridge.c
index 62133924679e25e5c4be273f3b33728bd3c53414..1a86a75400e2156b9df4563083222bb8c271e7dd 100644 (file)
--- 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 53bee46184a15a25cab9282f4f9c84f2a3eaaa58..41813f5a0a35a1e92fab4829303a7141bb20d5f6 100644 (file)
--- 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);
        }