[asterisk-commits] app confbridge: Allow muting of users waiting to enter a Con... (asterisk[certified/11.6])
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Feb 5 11:50:01 CST 2016
Joshua Colp has submitted this change and it was merged.
Change subject: app_confbridge: Allow muting of users waiting to enter a ConfBridge
......................................................................
app_confbridge: Allow muting of users waiting to enter a ConfBridge
Prior to this patch, users waiting to enter a ConfBridge were not considered
when muted via the CLI or via AMI. Instead, a confusing message would be
emitted stating that the channel did not exist.
This patch allows a user to be muted when waiting to enter a ConfBridge
conference. This is equivalent to start when muted, only toggled via the CLI
or AMI.
Review: https://reviewboard.asterisk.org/r/3582
ASTERISK-23824 #close
patches:
rb3582.patch uploaded by tm1000 (License 6524)
Cherry-picked to support ASTERISK-20987
Change-Id: I61d5475a1cd53adfde3c2d0ab6ab45c5b100cae8
---
M apps/app_confbridge.c
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
Mark Michelson: Looks good to me, approved; Verified
Joshua Colp: Looks good to me, but someone else must approve
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index f8b1325..988f5fe 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -2384,6 +2384,14 @@
break;
}
}
+ if (!participant) {
+ /* user is not in the active list so check the waiting list as well */
+ AST_LIST_TRAVERSE(&bridge->waiting_list, participant, list) {
+ if (!strncmp(user, ast_channel_name(participant->chan), strlen(user))) {
+ break;
+ }
+ }
+ }
if (participant) {
/* Set user level mute request. */
participant->muted = mute ? 1 : 0;
--
To view, visit https://gerrit.asterisk.org/2120
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61d5475a1cd53adfde3c2d0ab6ab45c5b100cae8
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: certified/11.6
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>
More information about the asterisk-commits
mailing list