From: Matthew Jordan <mjordan@digium.com>
Date: Thu, 5 Jun 2014 14:39:08 +0000 (+0000)
Subject: app_confbridge: Allow muting of users waiting to enter a ConfBridge
X-Git-Tag: 12.4.0-rc1~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a28bd4b74cfa249e5cd5df93b767063a3ae411d;p=thirdparty%2Fasterisk.git

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)
........

Merged revisions 415206 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@415207 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index 2c84e8a349..5084a50087 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -2421,6 +2421,14 @@ static int generic_mute_unmute_helper(int mute, const char *conference_name, con
 			break;
 		}
 	}
+	if (!user) {
+		/* user is not in the active list so check the waiting list as well */
+		AST_LIST_TRAVERSE(&conference->waiting_list, user, list) {
+			if (!strncmp(chan_name, ast_channel_name(user->chan), strlen(chan_name))) {
+				break;
+			}
+		}
+	}
 	if (user) {
 		/* Set user level mute request. */
 		user->muted = mute ? 1 : 0;