From a890f5469ba183b44203edd7825f285392b1b5f2 Mon Sep 17 00:00:00 2001 From: Matthew Jordan <mjordan@digium.com> Date: Thu, 5 Jun 2014 14:32:38 +0000 Subject: [PATCH] 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) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@415206 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_confbridge.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index 909cb00ac3..70844d6a4b 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -2392,6 +2392,14 @@ static int generic_mute_unmute_helper(int mute, const char *conference, const ch 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; -- GitLab