From: Matthew Jordan <mjordan@digium.com>
Date: Thu, 5 Jun 2014 14:32:38 +0000 (+0000)
Subject: app_confbridge: Allow muting of users waiting to enter a ConfBridge
X-Git-Tag: certified/11.6-cert13~10^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b45be25f45bd2e3562e2904764d4e074a08eaa6e;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)

Cherry-picked to support ASTERISK-20987

Change-Id: I61d5475a1cd53adfde3c2d0ab6ab45c5b100cae8
---

diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index f8b1325e66..988f5fe6bf 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -2384,6 +2384,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;