summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/bridge.c2
-rw-r--r--main/channel_internal_api.c1
-rw-r--r--main/features.c2
3 files changed, 1 insertions, 4 deletions
diff --git a/main/bridge.c b/main/bridge.c
index 9a64b0ed6..b8f69fe3a 100644
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -1482,7 +1482,6 @@ int ast_bridge_join(struct ast_bridge *bridge,
ao2_ref(bridge_channel, -1);
join_exit:;
-/* BUGBUG this is going to cause problems for DTMF atxfer attended bridge between B & C. Maybe an ast_bridge_join_internal() that does not do the after bridge goto for this case. */
ast_bridge_run_after_callback(chan);
if (!(ast_channel_softhangup_internal_flag(chan) & AST_SOFTHANGUP_ASYNCGOTO)
&& !ast_bridge_setup_after_goto(chan)) {
@@ -1960,7 +1959,6 @@ int bridge_do_move(struct ast_bridge *dst_bridge, struct ast_bridge_channel *bri
int was_in_bridge;
int res = 0;
-/* BUGBUG need bridge move stasis event and a success/fail event. */
if (bridge_channel->swap) {
ast_debug(1, "Moving %p(%s) into bridge %s swapping with %s\n",
bridge_channel, ast_channel_name(bridge_channel->chan), dst_bridge->uniqueid,
diff --git a/main/channel_internal_api.c b/main/channel_internal_api.c
index f40852f0b..122b8cfdf 100644
--- a/main/channel_internal_api.c
+++ b/main/channel_internal_api.c
@@ -193,7 +193,6 @@ struct ast_channel {
unsigned short transfercapability; /*!< ISDN Transfer Capability - AST_FLAG_DIGITAL is not enough */
-/* BUGBUG the bridge pointer must change to an ast_channel_bridge pointer because it will never change while the channel is in the bridging system whereas the bridge could change. */
struct ast_bridge *bridge; /*!< Bridge this channel is participating in */
struct ast_bridge_channel *bridge_channel;/*!< The bridge_channel this channel is linked with. */
struct ast_timer *timer; /*!< timer object that provided timingfd */
diff --git a/main/features.c b/main/features.c
index e2d668426..9e5dfddb3 100644
--- a/main/features.c
+++ b/main/features.c
@@ -792,7 +792,7 @@ static int setup_bridge_features_dynamic(struct ast_bridge_features *features, s
return res;
}
-/* BUGBUG this really should be made a private function of bridging_basic.c after struct ast_call_feature is made an ao2 object. */
+/* BUGBUG this really should be made a private function of bridge_basic.c after struct ast_call_feature is made an ao2 object. */
int ast_bridge_channel_setup_features(struct ast_bridge_channel *bridge_channel)
{
int res = 0;