[svn-commits] mjordan: branch 12 r415207 - in /branches/12: ./ apps/app_confbridge.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Thu Jun  5 09:39:08 2014
New Revision: 415207

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

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

Modified:
    branches/12/   (props changed)
    branches/12/apps/app_confbridge.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

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