Fix a bug where receiving a control frame of subclass -1 would cause certain channels...

[asterisk/asterisk.git] / main / bridging.c

diff --git a/main/bridging.c b/main/bridging.c
index 4546c83..2f5afa2 100644 (file)
--- a/main/bridging.c
+++ b/main/bridging.c
@@ -108,7 +108,7 @@ int ast_bridge_technology_unregister(struct ast_bridge_technology *technology)
                        break;
                }
        }
-       AST_RWLIST_TRAVERSE_SAFE_END
+       AST_RWLIST_TRAVERSE_SAFE_END;
 
        AST_RWLIST_UNLOCK(&bridge_technologies);
 
@@ -261,6 +261,18 @@ static struct ast_frame *bridge_handle_dtmf(struct ast_bridge *bridge, struct as
        return frame;
 }
 
+/*! \brief Internal function used to determine whether a control frame should be dropped or not */
+static int bridge_drop_control_frame(int subclass)
+{
+       switch (subclass) {
+       case AST_CONTROL_ANSWER:
+       case -1:
+               return 1;
+       default:
+               return 0;
+       }
+}
+
 void ast_bridge_handle_trip(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, struct ast_channel *chan, int outfd)
 {
        /* If no bridge channel has been provided and the actual channel has been provided find it */
@@ -276,8 +288,8 @@ void ast_bridge_handle_trip(struct ast_bridge *bridge, struct ast_bridge_channel
                if (!frame || (frame->frametype == AST_FRAME_CONTROL && frame->subclass == AST_CONTROL_HANGUP)) {
                        /* Signal the thread that is handling the bridged channel that it should be ended */
                        ast_bridge_change_state(bridge_channel, AST_BRIDGE_CHANNEL_STATE_END);
-               } else if (frame->frametype == AST_FRAME_CONTROL && frame->subclass == AST_CONTROL_ANSWER) {
-                       ast_debug(1, "Dropping answer frame from bridge channel %p\n", bridge_channel);
+               } else if (frame->frametype == AST_FRAME_CONTROL && bridge_drop_control_frame(frame->subclass)) {
+                       ast_debug(1, "Dropping control frame from bridge channel %p\n", bridge_channel);
                } else {
                        if (frame->frametype == AST_FRAME_DTMF_BEGIN) {
                                frame = bridge_handle_dtmf(bridge, bridge_channel, frame);
@@ -319,7 +331,7 @@ static int generic_thread_loop(struct ast_bridge *bridge)
                /* Move channels around for priority reasons if we have more than one channel in our array */
                if (bridge->array_num > 1) {
                        struct ast_channel *first = bridge->array[0];
-                       memmove(bridge->array, bridge->array + 1, sizeof(bridge->array) - 1);
+                       memmove(bridge->array, bridge->array + 1, sizeof(struct ast_channel *) * (bridge->array_num - 1));
                        bridge->array[(bridge->array_num - 1)] = first;
                }