From 1ec791a3ba09be14d288be29d70677cbd0545e4a Mon Sep 17 00:00:00 2001
From: Jonathan Rose <jrose@digium.com>
Date: Tue, 1 Dec 2015 16:11:07 -0600
Subject: [PATCH] Unset BRIDGEPEER when leaving a bridge
Currently if a channel is transferred out of a bridge, the BRIDGEPEER
variable (also BRIDGEPVTCALLID) remain set even once the channel is
out of the bridge. This patch removes these variables when leaving
the bridge.
ASTERISK-25600 #close
Reported by: Mark Michelson
Change-Id: I753ead2fffbfc65427ed4e9244c7066610e546da
---
include/asterisk/bridge.h | 12 ++++++++++++
main/bridge.c | 10 +++++-----
main/bridge_channel.c | 4 ++++
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/include/asterisk/bridge.h b/include/asterisk/bridge.h
index ccfb541b9a..0616f0e22f 100644
--- a/include/asterisk/bridge.h
+++ b/include/asterisk/bridge.h
@@ -738,6 +738,18 @@ int ast_bridge_suspend(struct ast_bridge *bridge, struct ast_channel *chan);
*/
int ast_bridge_unsuspend(struct ast_bridge *bridge, struct ast_channel *chan);
+/*!
+ * \brief Sets BRIDGECHANNEL and BRIDGEPVTCALLID for a channel
+ *
+ * \pre chan must be locked before calling
+ *
+ * \param name channel name of the bridged peer
+ * \param pvtid Private CallID of the bridged peer
+ *
+ * \return nothing
+ */
+void ast_bridge_vars_set(struct ast_channel *chan, const char *name, const char *pvtid);
+
struct ast_unreal_pvt;
/*!
diff --git a/main/bridge.c b/main/bridge.c
index a63f745e33..3a01b58a3b 100644
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -1264,7 +1264,7 @@ static void check_bridge_play_sounds(struct ast_bridge *bridge)
}
}
-static void update_bridge_vars_set(struct ast_channel *chan, const char *name, const char *pvtid)
+void ast_bridge_vars_set(struct ast_channel *chan, const char *name, const char *pvtid)
{
ast_channel_stage_snapshot(chan);
pbx_builtin_setvar_helper(chan, "BRIDGEPEER", name);
@@ -1304,12 +1304,12 @@ static void set_bridge_peer_vars_2party(struct ast_channel *c0, struct ast_chann
ast_channel_unlock(c1);
ast_channel_lock(c0);
- update_bridge_vars_set(c0, c1_name, c1_pvtid);
+ ast_bridge_vars_set(c0, c1_name, c1_pvtid);
UPDATE_BRIDGE_VARS_GET(c0, c0_name, c0_pvtid);
ast_channel_unlock(c0);
ast_channel_lock(c1);
- update_bridge_vars_set(c1, c0_name, c0_pvtid);
+ ast_bridge_vars_set(c1, c0_name, c0_pvtid);
ast_channel_unlock(c1);
}
@@ -1410,7 +1410,7 @@ static void set_bridge_peer_vars_multiparty(struct ast_bridge *bridge)
++idx;
ast_channel_lock(bridge_channel->chan);
- update_bridge_vars_set(bridge_channel->chan, buf, NULL);
+ ast_bridge_vars_set(bridge_channel->chan, buf, NULL);
ast_channel_unlock(bridge_channel->chan);
}
}
@@ -1432,7 +1432,7 @@ static void set_bridge_peer_vars_holding(struct ast_bridge *bridge)
AST_LIST_TRAVERSE(&bridge->channels, bridge_channel, entry) {
ast_channel_lock(bridge_channel->chan);
- update_bridge_vars_set(bridge_channel->chan, NULL, NULL);
+ ast_bridge_vars_set(bridge_channel->chan, NULL, NULL);
ast_channel_unlock(bridge_channel->chan);
}
}
diff --git a/main/bridge_channel.c b/main/bridge_channel.c
index 8ccdbc1a4d..d6c1048079 100644
--- a/main/bridge_channel.c
+++ b/main/bridge_channel.c
@@ -289,6 +289,10 @@ void ast_bridge_channel_leave_bridge_nolock(struct ast_bridge_channel *bridge_ch
channel_set_cause(bridge_channel->chan, cause);
+ ast_channel_lock(bridge_channel->chan);
+ ast_bridge_vars_set(bridge_channel->chan, NULL, NULL);
+ ast_channel_unlock(bridge_channel->chan);
+
/* Change the state on the bridge channel */
bridge_channel->state = new_state;
--
GitLab