[svn-commits] mjordan: branch 11 r415206 - /branches/11/apps/app_confbridge.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Thu Jun  5 09:32:38 2014
New Revision: 415206

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=415206
Log:
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)

Modified:
    branches/11/apps/app_confbridge.c

Modified: branches/11/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/apps/app_confbridge.c?view=diff&rev=415206&r1=415205&r2=415206
==============================================================================
--- branches/11/apps/app_confbridge.c (original)
+++ branches/11/apps/app_confbridge.c Thu Jun  5 09:32:38 2014
@@ -2392,6 +2392,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;